Update to ClimaParameters 0.8

CliMA · Jan 18, 2024 · 4dfe3ff · 4dfe3ff
1 parent f38ee2f
commit 4dfe3ff
Show file tree

Hide file tree

Showing 31 changed files with 48 additions and 73 deletions.
diff --git a/Project.toml b/Project.toml
@@ -12,7 +12,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
-CLIMAParameters = "0.7.15"
+CLIMAParameters = "0.8"
 DocStringExtensions = "0.8, 0.9"
 ForwardDiff = "0.10"
 RootSolvers = "0.3, 0.4"

diff --git a/box/Alpert_Knopf_2016_backward.jl b/box/Alpert_Knopf_2016_backward.jl
@@ -2,6 +2,9 @@ import CairoMakie as MK
 import Dierckx as DX
 import Random as RD
 import Distributions as DS
+
+import CLIMAParameters
+import Thermodynamics as TD
 import CloudMicrophysics as CM
 import CloudMicrophysics.Parameters as CMP
 import CloudMicrophysics.Common as CMO
@@ -85,7 +88,7 @@ A_sum = similar(T)
 compute_Asum!(A_sum, Aj_sorted, T)
 
 # Compute the immersion freezing rate from CloudMicrophysics
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 aerosol = CMP.Illite(FT)
 Δa = @. FT(1) - CMO.a_w_ice(tps, T)
 J_immer = @. CMI_het.ABIFM_J(aerosol, Δa) # m^-2 s^-1

diff --git a/box/Alpert_Knopf_2016_forward.jl b/box/Alpert_Knopf_2016_forward.jl
@@ -1,5 +1,7 @@
-import CloudMicrophysics as CM
 import CairoMakie as MK
+
+import Thermodynamics as TD
+import CloudMicrophysics as CM
 import CloudMicrophysics.Parameters as CMP
 import CloudMicrophysics.Common as CMO
 import CloudMicrophysics.HetIceNucleation as CMI_het
@@ -25,7 +27,7 @@ N_ice = 0
 T_initial = FT(256)         # initial temperature, K
 cooling_rate = FT(0.5 / 60) # prescribed cooling rate K s^-1
 aerosol = CMP.Illite(FT)    # aerosol free parameters
-tps = CMP.ThermodynamicsParameters(FT) # thermodynamics free parameters
+tps = TD.Parameters.ThermodynamicsParameters(FT) # thermodynamics free parameters
 t_0 = 0
 t_end = 3310
 dt = 10

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -14,6 +14,5 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
-CLIMAParameters = "0.7.15"
 Documenter = "1.1"
 DocumenterCitations = "1.2"
diff --git a/docs/src/API.md b/docs/src/API.md
@@ -122,7 +122,6 @@ Parameters.TerminalVelocityType
 Parameters.Precipitation2MType
 Parameters.AirProperties
 Parameters.WaterProperties
-Parameters.ThermodynamicsParameters
 Parameters.ArizonaTestDust
 Parameters.DesertDust
 Parameters.Illite

diff --git a/docs/src/AerosolActivation.md b/docs/src/AerosolActivation.md
@@ -273,7 +273,7 @@ const CMP = CloudMicrophysics.Parameters
 const TD = Thermodynamics
 
 FT = Float64
-tps = CMP.ThermodynamicsParameters(FT)
+tps = Thermodynamics.Parameters.ThermodynamicsParameters(FT)
 aip = CMP.AirProperties(FT)
 ap = CMP.AerosolActivationParameters(FT)
 

diff --git a/docs/src/Microphysics1M.md b/docs/src/Microphysics1M.md
@@ -765,7 +765,7 @@ const CMP = CloudMicrophysics.Parameters
 
 FT = Float64
 
-const tps = CMP.ThermodynamicsParameters(FT)
+const tps = Thermodynamics.Parameters.ThermodynamicsParameters(FT)
 const aps = CMP.AirProperties(FT)
 const liquid = CMP.CloudLiquid(FT)
 const ice = CMP.CloudIce(FT)

diff --git a/docs/src/Microphysics2M.md b/docs/src/Microphysics2M.md
@@ -638,16 +638,16 @@ and the default free parameter values are:
 using CairoMakie
 CairoMakie.activate!(type = "svg")
 
-import CloudMicrophysics
 import CLIMAParameters
-
-const CM1 = CloudMicrophysics.Microphysics1M
-const CM2 = CloudMicrophysics.Microphysics2M
-const CMP = CloudMicrophysics.Parameters
+import Thermodynamics as TD
+import CloudMicrophysics
+import CloudMicrophysics.Microphysics1M as CM1
+import CloudMicrophysics.Microphysics2M as CM2
+import CloudMicrophysics.Parameters as CMP
 
 FT = Float64
 
-const tps = CMP.ThermodynamicsParameters(FT)
+const tps = TD.Parameters.ThermodynamicsParameters(FT)
 const aps = CMP.AirProperties(FT)
 
 const KK2000 = CMP.KK2000(FT)

diff --git a/docs/src/ThresholdsTransition.md b/docs/src/ThresholdsTransition.md
@@ -56,7 +56,7 @@ for i in 1:3
         println(io, "value = " * string(k_thrshld_stpnss_values[i]))
         println(io, "type = \"float\"")
     end
-    toml_dict = CP.create_toml_dict(FT; override_file, dict_type="alias")
+    toml_dict = CP.create_toml_dict(FT; override_file)
     isfile(override_file) && rm(override_file; force=true)
 
     push!(rain, CMP.Rain(FT, toml_dict))

diff --git a/docs/src/plots/ARGplots.jl b/docs/src/plots/ARGplots.jl
@@ -13,7 +13,7 @@ const TD = Thermodynamics
 
 FT = Float64
 
-tps = CMP.ThermodynamicsParameters(FT)
+tps = Thermodynamics.Parameters.ThermodynamicsParameters(FT)
 aip = CMP.AirProperties(FT)
 ap = CMP.AerosolActivationParameters(FT)
 

diff --git a/docs/src/plots/Baumgartner2022_fig5.jl b/docs/src/plots/Baumgartner2022_fig5.jl
@@ -9,7 +9,7 @@ const CMO = CM.Common
 const CMP = CM.Parameters
 
 FT = Float64
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 
 # Baumgartner at al 2022 Figure 5

diff --git a/docs/src/plots/HomFreezingPlots.jl b/docs/src/plots/HomFreezingPlots.jl
@@ -9,7 +9,7 @@ const CMI = CM.HomIceNucleation
 const CMP = CM.Parameters
 
 FT = Float64
-const tps = CMP.ThermodynamicsParameters(FT)
+const tps = TD.Parameters.ThermodynamicsParameters(FT)
 const H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 const ip = CMP.IceNucleationParameters(FT)
 

diff --git a/docs/src/plots/KnopfAlpert2013_fig1.jl b/docs/src/plots/KnopfAlpert2013_fig1.jl
@@ -1,13 +1,13 @@
 import Plots as PL
 
+import Thermodynamics as TD
 import CloudMicrophysics as CM
-
-const IN = CM.HetIceNucleation
-const CMP = CM.Parameters
-const CO = CM.Common
+import CloudMicrophysics.Common as CO
+import CloudMicrophysics.HetIceNucleation as IN
+import CloudMicrophysics.Parameters as CMP
 
 FT = Float64
-const tps = CMP.ThermodynamicsParameters(FT)
+const tps = TD.Parameters.ThermodynamicsParameters(FT)
 const H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 const kaolinite = CMP.Kaolinite(FT) # dust type
 

diff --git a/docs/src/plots/KnopfAlpert2013_fig5.jl b/docs/src/plots/KnopfAlpert2013_fig5.jl
@@ -1,14 +1,14 @@
 import CairoMakie as MK
 
+import CLIMAParameters
 import Thermodynamics as TD
 import CloudMicrophysics as CM
-
-const CMO = CM.Common
-const CMI = CM.HetIceNucleation
-const CMP = CM.Parameters
+import CloudMicrophysics.Common as CMO
+import CloudMicrophysics.HetIceNucleation as CMI
+import CloudMicrophysics.Parameters as CMP
 
 FT = Float64
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 illite = CMP.Illite(FT)    # dust type
 

diff --git a/docs/src/plots/RainEvapoartionSB2006.jl b/docs/src/plots/RainEvapoartionSB2006.jl
@@ -12,7 +12,7 @@ import CloudMicrophysics.Microphysics2M as CM2
 
 FT = Float64
 
-const tps = CMP.ThermodynamicsParameters(FT)
+const tps = TD.Parameters.ThermodynamicsParameters(FT)
 const aps = CMP.AirProperties(FT)
 const SB2006 = CMP.SB2006(FT)
 

diff --git a/docs/src/plots/T_vs_wateractivity.jl b/docs/src/plots/T_vs_wateractivity.jl
@@ -8,7 +8,7 @@ const CMO = CM.Common
 const CMP = CM.Parameters
 
 FT = Float64
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 
 T_range = range(190, stop = 234, length = 100)

diff --git a/parcel/Immersion_Freezing.jl b/parcel/Immersion_Freezing.jl
@@ -8,7 +8,7 @@ import CLIMAParameters as CP
 include(joinpath(pkgdir(CM), "parcel", "parcel.jl"))
 FT = Float64
 # get free parameters
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 aps = CMP.AirProperties(FT)
 wps = CMP.WaterProperties(FT)
 ip = CMP.IceNucleationParameters(FT)

diff --git a/parcel/Liquid_only.jl b/parcel/Liquid_only.jl
@@ -10,7 +10,7 @@ include(joinpath(pkgdir(CM), "parcel", "parcel.jl"))
 FT = Float64
 
 # Get free parameters
-tps = CMP.ThermodynamicsParameters(FT)
+tps = TD.Parameters.ThermodynamicsParameters(FT)
 wps = CMP.WaterProperties(FT)
 aps = CMP.AirProperties(FT)
 ip = CMP.IceNucleationParameters(FT)

diff --git a/parcel/Tully_et_al_2023.jl b/parcel/Tully_et_al_2023.jl
@@ -44,7 +44,7 @@ end
 function Tully_et_al_2023(FT)
 
     # get free parameters
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     aps = CMP.AirProperties(FT)
     wps = CMP.WaterProperties(FT)
     ip = CMP.IceNucleationParameters(FT)

diff --git a/src/parameters/Parameters.jl b/src/parameters/Parameters.jl
@@ -12,9 +12,6 @@ import CLIMAParameters as CP
 # Super-types (dispatch, broadcasting, etc...)
 include("AbstractTypes.jl")
 
-# Thermodynamics.jl parameters
-include("Thermodynamics.jl")
-
 # Parameters for moist air and water
 include("AirProperties.jl")
 include("WaterProperties.jl")

diff --git a/src/parameters/Thermodynamics.jl b/src/parameters/Thermodynamics.jl
diff --git a/test/Project.toml b/test/Project.toml
@@ -9,6 +9,3 @@ KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
-
-[compat]
-CLIMAParameters = "0.7.15"
diff --git a/test/aerosol_activation_tests.jl b/test/aerosol_activation_tests.jl
@@ -11,7 +11,7 @@ import CloudMicrophysics.Parameters as CMP
 
 function test_aerosol_activation(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     aip = CMP.AirProperties(FT)
     ap = CMP.AerosolActivationParameters(FT)
 

diff --git a/test/aqua.jl b/test/aqua.jl
@@ -41,8 +41,7 @@ using Aqua
         Aqua.test_stale_deps(CloudMicrophysics)
         Aqua.test_deps_compat(CloudMicrophysics)
         Aqua.test_project_extras(CloudMicrophysics)
-        Aqua.test_project_toml_formatting(CloudMicrophysics)
-        Aqua.test_piracy(CloudMicrophysics)
+        Aqua.test_piracies(CloudMicrophysics)
     end
 
 end

diff --git a/test/common_functions_tests.jl b/test/common_functions_tests.jl
@@ -1,5 +1,6 @@
 import Test as TT
 
+import Thermodynamics as TD
 import CloudMicrophysics as CM
 import CloudMicrophysics.Common as CO
 import CloudMicrophysics.Parameters as CMP
@@ -85,7 +86,7 @@ end
 
 function test_a_w_xT(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
 
     TT.@testset "a_w_xT" begin
@@ -111,7 +112,7 @@ end
 
 function test_a_w_eT(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
 
     TT.@testset "a_w_eT" begin
 
@@ -132,7 +133,7 @@ end
 
 function test_a_w_ice(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
 
     TT.@testset "a_w_ice" begin
 

diff --git a/test/gpu_tests.jl b/test/gpu_tests.jl
@@ -538,7 +538,7 @@ function test_gpu(FT)
 
     # thermodynamics and air properties
     aps = CMP.AirProperties(FT)
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
 
     # aerosol activation
     ap = CMP.AerosolActivationParameters(FT)

diff --git a/test/heterogeneous_ice_nucleation_tests.jl b/test/heterogeneous_ice_nucleation_tests.jl
@@ -13,7 +13,7 @@ import CloudMicrophysics.HetIceNucleation as CMI_het
 function test_heterogeneous_ice_nucleation(FT)
 
     # parameters for parameterizations
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
     ip = CMP.IceNucleationParameters(FT)
     # more parameters for aerosol properties

diff --git a/test/homogeneous_ice_nucleation_tests.jl b/test/homogeneous_ice_nucleation_tests.jl
@@ -12,7 +12,7 @@ import CloudMicrophysics.HomIceNucleation as CMH
 
 function test_homogeneous_J(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     H2SO4_prs = CMP.H2SO4SolutionParameters(FT)
     ip = CMP.IceNucleationParameters(FT)
 

diff --git a/test/microphysics1M_tests.jl b/test/microphysics1M_tests.jl
@@ -13,7 +13,7 @@ import CloudMicrophysics.Microphysics1M as CM1
 
 function test_microphysics1M(FT)
 
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
     aps = CMP.AirProperties(FT)
 
     rain = CMP.Rain(FT)

diff --git a/test/microphysics2M_tests.jl b/test/microphysics2M_tests.jl
@@ -24,7 +24,7 @@ function test_microphysics2M(FT)
 
     # Thermodynamics and air properties parameters
     aps = CMP.AirProperties(FT)
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
 
     # Terminal velocity parameters
     SB2006Vel = CMP.SB2006VelType(FT)

diff --git a/test/performance_tests.jl b/test/performance_tests.jl
@@ -67,7 +67,7 @@ function benchmark_test(FT)
     organ_nuc = CMP.OrganicNucleationParameters(FT)
     # air and thermodunamics parameters
     aps = CMP.AirProperties(FT)
-    tps = CMP.ThermodynamicsParameters(FT)
+    tps = TD.Parameters.ThermodynamicsParameters(FT)
 
     ρ_air = FT(1.2)
     T_air = FT(280)