update to new parameter name and remove 0.2 CLIMAParameters from compat

CliMA · Dec 14, 2021 · 320dfe8 · 320dfe8
1 parent 20de556
commit 320dfe8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -40,7 +40,7 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 [compat]
 ArgParse = "1.1"
 ArtifactWrappers = "0.1"
-CLIMAParameters = "0.2, 0.3"
+CLIMAParameters = "0.3"
 ClimaCore = "0.2, 0.3, 0.4, 0.5"
 CloudMicrophysics = "0.3"
 Debugger = "0.6"

diff --git a/driver/generate_namelist.jl b/driver/generate_namelist.jl
@@ -286,7 +286,7 @@ function Rico(namelist_defaults)
     namelist["time_stepping"]["dt_min"] = 1.5
 
     namelist["microphysics"]["precipitation_model"] = "clima_1m"
-    namelist["microphysics"]["τ_acnv"] = 2500.0
+    namelist["microphysics"]["τ_acnv_rai"] = 2500.0
 
     namelist["meta"]["simname"] = "Rico"
     namelist["meta"]["casename"] = "Rico"

diff --git a/driver/parameter_set.jl b/driver/parameter_set.jl
@@ -15,7 +15,7 @@ CLIMAParameters.Planet.molmass_ratio(ps::EarthParameterSet) = ps.nt.molmass_rati
 # microphysics 0-moment parameters
 CLIMAParameters.Atmos.Microphysics_0M.τ_precip(ps::EarthParameterSet) = ps.nt.τ_precip
 # microphysics 1-moment parameters
-CLIMAParameters.Atmos.Microphysics.τ_acnv(ps::EarthParameterSet) = ps.nt.τ_acnv
+CLIMAParameters.Atmos.Microphysics.τ_acnv_rai(ps::EarthParameterSet) = ps.nt.τ_acnv_rai
 # entrainment/detrainment parameters
 CLIMAParameters.Atmos.EDMF.c_ε(ps::EarthParameterSet) = ps.nt.c_ε # factor multiplyer for dry term in entrainment/detrainment
 CLIMAParameters.Atmos.EDMF.α_b(ps::EarthParameterSet) = ps.nt.α_b # factor multiplyer for pressure buoyancy terms (effective buoyancy is (1-α_b))
@@ -48,7 +48,7 @@ function create_parameter_set(namelist)
         R_v = 461.5,
         molmass_ratio = 461.5/287.1,
         τ_precip = TC.parse_namelist(namelist, "microphysics", "τ_precip"; default = 1000.0),
-        τ_acnv = TC.parse_namelist(namelist, "microphysics", "τ_acnv"; default = 1000.0),
+        τ_acnv_rai = TC.parse_namelist(namelist, "microphysics", "τ_acnv_rai"; default = 1000.0),
         c_ε = TC.parse_namelist(namelist, "turbulence", "EDMF_PrognosticTKE", "entrainment_factor"),
         c_div = TC.parse_namelist(namelist, "turbulence", "EDMF_PrognosticTKE", "entrainment_massflux_div_factor"; default = 0.0),
         α_b = TC.parse_namelist(namelist, "turbulence", "EDMF_PrognosticTKE", "pressure_normalmode_buoy_coeff1"),