Merge #70

70: add more microphysics params for EDMF calibration r=trontrytel a=trontrytel

I want to try more things on the EDMF calibration side. Therefore I need more parameters. 

Will do a patch release after this lands.

Co-authored-by: Anna Jaruga <[email protected]>

Project.toml

@@ -1,7 +1,7 @@
 name = "CLIMAParameters"
 uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
 authors = ["Charles Kawczynski <[email protected]>"]
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

docs/src/API.md

@@ -228,6 +228,8 @@ Atmos.Microphysics.Δa_sno
 Atmos.Microphysics.χv_sno
 Atmos.Microphysics.Δv_sno
 Atmos.Microphysics.microph_scaling
+Atmos.Microphysics.microph_scaling_dep_sub
+Atmos.Microphysics.microph_scaling_melt
 Atmos.Microphysics.E_liq_rai
 Atmos.Microphysics.E_liq_sno
 Atmos.Microphysics.E_ice_rai

src/Atmos/Atmos.jl

@@ -237,6 +237,8 @@ export C_drag,
        χv_sno,
        Δv_sno,
        microph_scaling,
+       microph_scaling_dep_sub,
+       microph_scaling_melt,
        E_liq_rai,
        E_liq_sno,
        E_ice_rai,
@@ -372,8 +374,12 @@ function b_vent_rai end
 """ ventilation factor coefficient for snow (-) """
 function b_vent_sno end
 
-""" rain evaporation, snow deposition sublimation and melting scaling factor for coupling with EDMF (-) """
+""" rain evaporation scaling factor for coupling with EDMF (-) """
 function microph_scaling end
+""" snow deposition and sublimation scaling factor for coupling with EDMF (-) """
+function microph_scaling_dep_sub end
+""" snow melting scaling factor for coupling with EDMF (-) """
+function microph_scaling_melt end
 
 """ thermal conductivity of air (J/m/s/K) """
 function K_therm end

src/Atmos/atmos_parameters.jl

@@ -129,6 +129,8 @@ Microphysics.χv_sno(::AEPS)     = 1
 Microphysics.Δv_sno(::AEPS)     = 0
 
 Microphysics.microph_scaling(::AEPS) = 1.0
+Microphysics.microph_scaling_dep_sub(::AEPS) = 1.0
+Microphysics.microph_scaling_melt(::AEPS) = 1.0
 
 # interactions
 Microphysics.E_liq_rai(ps::AEPS) = 0.8

test/microphysics.jl

@@ -65,6 +65,8 @@ end
   @test !isnan(v0_sno(earth))
 
   @test !isnan(microph_scaling(earth))
+  @test !isnan(microph_scaling_dep_sub(earth))
+  @test !isnan(microph_scaling_melt(earth))
 
   @test !isnan(E_liq_rai(earth))
   @test !isnan(E_liq_sno(earth))