Merge branch 'main' into sk/try_dyamond_gpu

.buildkite/pipeline.yml

@@ -626,13 +626,20 @@ steps:
         artifact_paths: "diagnostic_edmfx_trmm_box/*"
         agents:
           slurm_mem: 20GB
+
+      - label: ":genie: Diagnostic EDMFX TRMM stretched grid in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/diagnostic_edmfx_trmm_stretched_box.yml
+        artifact_paths: "diagnostic_edmfx_trmm_stretched_box/*"
+        agents:
+          slurm_mem: 20GB
 
       - label: ":genie: Diagnostic EDMFX aquaplanet with TKE"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet_tke.yml
         artifact_paths: "diagnostic_edmfx_aquaplanet_tke/*"
-        soft_fail: true
         agents:
           slurm_mem: 20GB
 
@@ -644,20 +651,47 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: EDMFX Bomex in a box entr 1 detr 0.001 dt 1 t_end 3hrs"
+      - label: ":genie: EDMFX GABLS in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_gabls_box.yml
+        artifact_paths: "edmfx_gabls_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX Dycoms RF01 in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_dycoms_rf01_box.yml
+        artifact_paths: "edmfx_dycoms_rf01_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX Bomex in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_bomex_box.yml
+        artifact_paths: "edmfx_bomex_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX Rico in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_bomex_box_v1.yml
-        artifact_paths: "edmfx_bomex_box_v1/*"
+          --config_file $CONFIG_PATH/edmfx_rico_box.yml
+        artifact_paths: "edmfx_rico_box/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: EDMFX Bomex in a box entr 1 detr 0.01 dt 1 t_end 3hrs"
+      - label: ":genie: EDMFX TRMM in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_bomex_box_v2.yml
-        artifact_paths: "edmfx_bomex_box_v2/*"
+          --config_file $CONFIG_PATH/edmfx_trmm_box.yml
+        artifact_paths: "edmfx_trmm_box/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB

.dev/Manifest.toml

@@ -79,9 +79,9 @@ version = "0.21.4"
 
 [[deps.JuliaFormatter]]
 deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "Pkg", "PrecompileTools", "Tokenize"]
-git-tree-sha1 = "680fb31c8b8e2cf482f48e55d8fa01ccc4469e04"
+git-tree-sha1 = "2aa8cb5410821365a87f326631d7f6ce07db8882"
 uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
-version = "1.0.35"
+version = "1.0.36"
 
 [[deps.LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -152,9 +152,9 @@ version = "1.2.0"
 
 [[deps.Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
+git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.4.0"
+version = "1.4.1"
 
 [[deps.Printf]]
 deps = ["Unicode"]

Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaAtmos"
 uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 authors = ["Climate Modeling Alliance"]
-version = "0.16.0"
+version = "0.16.1"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
@@ -56,7 +56,7 @@ CUDA = "4"
 ClimaComms = "0.5"
 ClimaCore = "0.10"
 ClimaTimeSteppers = "0.7"
-CloudMicrophysics = "0.13"
+CloudMicrophysics = "0.14"
 Colors = "0.12"
 Dierckx = "0.5"
 DiffEqCallbacks = "2"

README.md

@@ -42,7 +42,7 @@ ClimaAtmos.jl is the atmosphere components of the CliMA software stack. We striv
 
 ## Installation instructions
 
-Recommended Julia: Stable release v1.8.5
+Recommended Julia: Stable release v1.9.3
 
 ClimaAtmos.jl is a [registered Julia package](https://julialang.org/packages/). To install
 

config/default_configs/default_config.yml

@@ -246,3 +246,6 @@ prognostic_surface:
 override_τ_precip:
   help: "If true, sets τ_precip to dt. Otherwise, τ_precip is set to the value in the toml dictionary"
   value: true
+log_params:
+  help: "Log parameters to file [`false` (default), `true`]"
+  value: false

config/default_configs/default_edmf_config.yml

@@ -23,24 +23,18 @@ edmfx_nh_pressure:
 turbconv_case:
   help: "The case run by Turbulence convection scheme [`Bomex` (default), `Bomex`, `DYCOMS_RF01`, `TRMM_LBA`, `GABLS`]"
   value: ~
-edmfx_entr_detr:
-  help: "If set to true, it switches on EDMFX entrainment/detrainment closure.  [`true`, `false` (default)]"
-  value: false
+edmfx_entr_model:
+  help: "EDMFX entrainment closure.  [`nothing` (default), `PiGroups`, `ConstantCoefficent`, `ConstantTimescale`]"
+  value: ~
+edmfx_detr_model:
+  help: "EDMFX detrainment closure.  [`nothing` (default), `PiGroups`, `ConstantCoefficent`]"
+  value: ~
 edmfx_upwinding:
   help: "EDMFX upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]"
   value: none
 debugging_tc:
   help: "Save most of the tc aux state to HDF5 file [`false` (default), `true`]"
   value: false
-entr_coeff:
-  help: "Entrainment coefficient"
-  value: 1.0
-entr_tau:
-  help: "Entrainment timescale"
-  value: 900.0
-detr_coeff:
-  help: "Detrainment coefficient"
-  value: 0.001
 edmfx_sgs_flux:
   help: "If set to true, it switches on EDMFX SGS flux.  [`true`, `false` (default)]"
-  value: false
+  value: false

config/longrun_configs/longrun_aquaplanet_amip.yml

@@ -13,7 +13,8 @@ surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx" 
 prognostic_tke: true
 edmfx_upwinding: "first_order" 
-edmfx_entr_detr: true 
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 rayleigh_sponge: true

config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml

@@ -5,11 +5,12 @@ rad: gray
 turbconv: diagnostic_edmfx 
 prognostic_tke: true
 edmfx_upwinding: first_order 
-edmfx_entr_detr: true 
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 moist: equil 
 precip_model: 0M
-dt: 50secs 
-t_end: 3hours 
+dt: 10secs 
+t_end: 1hours 
 dt_save_to_disk: 600secs

config/model_configs/diagnostic_edmfx_bomex_box.yml

@@ -8,7 +8,8 @@ surface_setup: "Bomex"
 turbconv: "diagnostic_edmfx" 
 prognostic_tke: true
 edmfx_upwinding: "first_order" 
-edmfx_entr_detr: true 
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 moist: "equil"

config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml

@@ -8,7 +8,8 @@ surface_setup: "Bomex"
 turbconv: "diagnostic_edmfx" 
 prognostic_tke: true
 edmfx_upwinding: "first_order" 
-edmfx_entr_detr: true 
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 moist: "equil"

config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml

@@ -7,7 +7,8 @@ surface_setup: DYCOMS_RF01
 turbconv: diagnostic_edmfx 
 prognostic_tke: true
 edmfx_upwinding: first_order 
-edmfx_entr_detr: true 
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 moist: equil

config/model_configs/diagnostic_edmfx_gabls_box.yml

@@ -5,7 +5,8 @@ surface_setup: GABLS
 turbconv: diagnostic_edmfx
 prognostic_tke: true
 edmfx_upwinding: first_order
-edmfx_entr_detr: true
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true 
 edmfx_sgs_flux: true
 moist: equil

config/model_configs/diagnostic_edmfx_rico_box.yml

@@ -7,7 +7,8 @@ surface_setup: Rico
 turbconv: diagnostic_edmfx
 prognostic_tke: true
 edmfx_upwinding: first_order
-edmfx_entr_detr: true
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true
 edmfx_sgs_flux: true
 moist: equil

config/model_configs/diagnostic_edmfx_trmm_box.yml

@@ -6,12 +6,14 @@ surface_setup: TRMM_LBA
 turbconv: diagnostic_edmfx
 prognostic_tke: true
 edmfx_upwinding: first_order
-edmfx_entr_detr: true
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
 edmfx_nh_pressure: true
 edmfx_sgs_flux: true
 moist: equil
 apply_limiter: false
 precip_model: "0M"
+override_τ_precip: false
 config: box
 hyperdiff: "true"
 kappa_4: 1e12
@@ -26,3 +28,4 @@ dt: 10secs
 t_end: 6hours
 dt_save_to_disk: 10mins
 FLOAT_TYPE: "Float64"
+toml: [toml/diagnostic_edmfx_trmm_box.toml]

config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml

@@ -0,0 +1,32 @@
+
+job_id: diagnostic_edmfx_trmm_stretched_box
+initial_condition: TRMM_LBA
+rad: TRMM_LBA
+surface_setup: TRMM_LBA
+turbconv: diagnostic_edmfx
+prognostic_tke: true
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantTimescale" 
+edmfx_detr_model: "ConstantCoefficient" 
+edmfx_nh_pressure: true
+edmfx_sgs_flux: true
+moist: equil
+apply_limiter: false
+precip_model: "0M"
+override_τ_precip: false
+config: box
+hyperdiff: "true"
+kappa_4: 1e12
+x_max: 1e5
+y_max: 1e5
+x_elem: 2
+y_elem: 2
+z_elem: 20
+z_max: 16400
+dz_bottom: 100
+dz_top: 2000
+dt: 10secs
+t_end: 6hours
+dt_save_to_disk: 10mins
+FLOAT_TYPE: "Float64"
+toml: [toml/diagnostic_edmfx_trmm_box.toml]

config/model_configs/edmfx_adv_test_box.yml

@@ -1,18 +1,21 @@
-dt_save_to_disk: "100secs"
+job_id: "edmfx_adv_test_box"
 initial_condition: "MoistAdiabaticProfileEDMFX"
-x_max: 10000.0
-hyperdiff: "true"
-z_elem: 45
-dt: "10secs"
-t_end: "1000secs"
-y_max: 10000.0
-y_elem: 2
+advection_test: true
 turbconv: "edmfx"
-x_elem: 2
-dz_bottom: 30.0
 ode_algo: "SSP33ShuOsher"
+edmfx_upwinding: "first_order"
 config: "box"
-advection_test: true
-kappa_4: 1.0e8
-job_id: "edmfx_adv_test_box"
 moist: "equil"
+hyperdiff: "true"
+kappa_4: 1e8
+x_max: 1e4
+y_max: 1e4
+z_max: 3e4
+x_elem: 2
+y_elem: 2
+z_elem: 45
+dz_bottom: 30.0
+dt: "10secs"
+t_end: "3600secs"
+dt_save_to_disk: "100secs"
+toml: [toml/edmfx_box_advection.toml]

config/model_configs/edmfx_bomex_box_v1.yml → config/model_configs/edmfx_bomex_box.yml

@@ -1,26 +1,29 @@
-edmf_coriolis: "Bomex"
-dt_save_to_disk: "60secs"
+job_id: "edmfx_bomex_box"
 initial_condition: "Bomex"
-x_max: 100000.0
-hyperdiff: "true"
-z_elem: 60
-dt: "1secs"
-edmfx_upwinding: first_order
+subsidence: "Bomex"
+edmf_coriolis: "Bomex"
+ls_adv: "Bomex"
 surface_setup: "Bomex"
-perturb_initstate: false
-edmfx_entr_detr: true
-t_end: "10800secs"
-y_max: 100000.0
-y_elem: 2
 turbconv: "edmfx"
-z_stretch: false
-vert_diff: "true"
-x_elem: 2
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+prognostic_tke: false
+moist: "equil"
 config: "box"
-subsidence: "Bomex"
+hyperdiff: "true"
 kappa_4: 1.0e12
-z_max: 3000.0
-ls_adv: "Bomex"
-job_id: "edmfx_bomex_box_v1"
-moist: "equil"
-toml: [toml/edmfx_bomex_box_v1.toml]
+x_max: 1e5
+y_max: 1e5
+z_max: 3e3
+x_elem: 2
+y_elem: 2
+z_elem: 60
+z_stretch: false
+perturb_initstate: false
+dt: "1secs"
+t_end: "10800secs"
+dt_save_to_disk: "10secs"
+toml: [toml/edmfx_box.toml]