remove unused code

Author: longemen3000

src/methods/pT.jl

@@ -1052,7 +1052,7 @@ export gibbs_energy,helmholtz_energy,gibbs_energy_res,helmholtz_energy_res
 export mass_enthalpy,mass_entropy,mass_internal_energy,mass_gibbs_energy,mass_gibbs_free_energy,mass_helmholtz_energy,mass_helmholtz_free_energy
 #second derivative order properties
 export isochoric_heat_capacity, isobaric_heat_capacity,adiabatic_index
-export mass_isobaric_heat_capacity,mass_isobaric_heat_capacity
+export mass_isobaric_heat_capacity,mass_isochoric_heat_capacity
 export isothermal_compressibility, isentropic_compressibility, speed_of_sound
 export isobaric_expansivity, joule_thomson_coefficient, inversion_temperature
 #higher derivative order properties

src/methods/property_solvers/multicomponent/bubble_point.jl

@@ -525,7 +525,7 @@ function bubble_temperature_init(model,p,x,vol0,T0,y0,volatiles)
 end
 
 """
-    bubble_temperature(model::EoSModel, p, x,method::BubblePointMethod = ChemPotBubbleTemperature())
+    bubble_temperature(model::EoSModel, p, x,method::ThermodynamicMethod = ChemPotBubbleTemperature())
 
 Calculates the bubble temperature and properties at a given pressure `p`.
 Returns a tuple, containing:

src/models/CompositeModel/LiquidVolumeModel/LiquidVolumeModel.jl

@@ -1,6 +1,6 @@
 abstract type LiquidVolumeModel <: GibbsBasedModel end
 
-include("NaNLiquid/NaNLiquid.jl")
+include("ZeroLiquid/ZeroLiquid.jl")
 include("Rackett/RackettLiquid.jl")
 include("COSTALD/costald.jl")
 include("DIPPR105Liquid/DIPPR105Liquid.jl")

…LiquidVolumeModel/NaNLiquid/NaNLiquid.jl …quidVolumeModel/ZeroLiquid/ZeroLiquid.jlsrc/models/CompositeModel/LiquidVolumeModel/NaNLiquid/NaNLiquid.jl renamed to src/models/CompositeModel/LiquidVolumeModel/ZeroLiquid/ZeroLiquid.jl src/models/CompositeModel/LiquidVolumeModel/NaNLiquid/NaNLiquid.jl renamed to src/models/CompositeModel/LiquidVolumeModel/ZeroLiquid/ZeroLiquid.jl

@@ -25,7 +25,8 @@ liquid = ZeroLiquid(["water","carbon dioxide"])
 ZeroLiquid
 
 export ZeroLiquid
-const NaNLiquid = ZeroLiquid
+
+@deprecate NaNLiquid(args...;kwargs...) ZeroLiquid(args...;kwargs...)
 
 function volume_impl(model::ZeroLiquidModel,p,T,z,phase,threaded,vol0)
     _0 = zero(first(z))

src/models/CompositeModel/SaturationModel/SaturationModel.jl

@@ -35,10 +35,10 @@ function saturation_temperature_impl(model::SaturationModel,p,method::Saturation
     return sol,nan,nan
 end
 
-#this method allows to use a Saturation Model as a whole fluid model. it supposes ideal gas and no info about the liquid phase (NaNLiquid)
+#this method allows to use a Saturation Model as a whole fluid model. it supposes ideal gas and no info about the liquid phase (ZeroLiquid)
 function init_puremodel(model::SaturationModel,components,userlocations,verbose)
     _components = format_components(components)
-    fluid = CompositeModel(_components,gas=BasicIdeal(),liquid=NaNLiquid(),saturation = model)
+    fluid = CompositeModel(_components,gas=BasicIdeal(),liquid=ZeroLiquid(),saturation = model)
     return EoSVectorParam(fluid,_components)
 end 
 

src/models/cubic/alphas/CPAAlpha.jl

@@ -53,7 +53,7 @@ end
 const sCPAAlphaModel = CPAAlphaModel
 
 @newmodelsimple sCPAAlpha CPAAlphaModel CPAAlphaParam
-
+export sCPAAlpha
 """
     sCPAAlpha <: sCPAAlphaModel
     
@@ -91,6 +91,7 @@ alpha = sCPAAlpha(["water","carbon dioxide"];userlocations = (;c1 = [0.67,0.76])
 sCPAAlpha
 default_locations(::Type{sCPAAlpha}) = ["SAFT/CPA/sCPA/sCPA_like.csv"]
 
+#=
 @newmodelsimple eCPAAlpha CPAAlphaModel CPAAlphaParam
 
 """
@@ -128,4 +129,5 @@ alpha = eCPAAlpha(["water","carbon dioxide"];userlocations = (;c1 = [0.67,0.76])
 
 """
 eCPAAlpha
-default_locations(::Type{eCPAAlpha}) = ["SAFT/CPA/eCPA/eCPA_like.csv"]
+default_locations(::Type{eCPAAlpha}) = ["SAFT/CPA/eCPA/eCPA_like.csv"]
+=#

src/models/cubic/alphas/RKAlpha.jl

@@ -1,6 +1,7 @@
 abstract type RKAlphaModel <: AlphaModel end
 
 @newmodelsingleton RKAlpha RKAlphaModel
+export RKAlpha
 
 """
     RKAlpha <: RKAlphaModel
@@ -45,4 +46,4 @@ function α_function(model::CubicModel,V,T,z::SingleComp,alpha_model::RKAlphaMod
     Tc = model.params.Tc.values[1]
     Tr = T/Tc
     α = 1 /sqrt(Tr)
-end
+end

src/utils/macros.jl

@@ -1,19 +1,4 @@
 #const IDEALTYPE = Union{T,Type{T}} where T<:EoSModel
-
-"""
-    arbitraryparam(params)
-
-Returns the first field in the struct that is a subtype of `ClapeyronParam`. Errors if it finds none.
-"""
-function arbitraryparam(params)
-    paramstype = typeof(params)
-    idx = findfirst(z->z <: ClapeyronParam,fieldtypes(paramstype))
-    if isnothing(idx)
-        error("The parameter struct ", paramstype, " must contain at least one ClapeyronParam")
-    end
-     return fieldnames(paramstype)[idx] |> z->getfield(params,z)
-end
-
 """
     @groups
 
@@ -622,6 +607,7 @@ the necessary traits to make the model compatible with Clapeyron routines.
     This macro is a no-op from Clapeyron 0.5 onwards.
 """
 macro registermodel(model)
+    Base.depwarn("`@registermodel` is deprecated, it is a no-op.")
     esc(model)
 end