Merge remote-tracking branch 'origin/main' into as/covar-deriv

.dev/Manifest.toml

@@ -1,6 +1,6 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.10.3"
+julia_version = "1.10.4"
 manifest_format = "2.0"
 project_hash = "b280bcf3b481823c97fa1a62c1b5e65114b8fa18"
 

NEWS.md

@@ -3,7 +3,8 @@ ClimaAtmos.jl Release Notes
 
 Main
 -------
-
+- ![][badge-🔥behavioralΔ] Removed the filter for shortwave radiative fluxes. 
+  PR [#3099](https://github.com/CliMA/ClimaAtmos.jl/pull/3099).
 
 v0.26.0
 -------
@@ -14,7 +15,7 @@ v0.26.0
 v0.25.0
 -------
 - ![][badge-💥breaking] Remove reference state from the dycore and the
-relevant config. PR [#3074](https://github.com/CliMA/ClimaAtmos.jl/pull/3074).
+  relevant config. PR [#3074](https://github.com/CliMA/ClimaAtmos.jl/pull/3074).
 - Make prognostic and diagnostic EDMF work with 1-moment microphysics on GPU
   PR [#3070](https://github.com/CliMA/ClimaAtmos.jl/pull/3070)
 - Add precipitation heating terms for 1-moment microphysics

Project.toml

@@ -53,7 +53,7 @@ ClimaComms = "0.6.2"
 ClimaCore = "0.14.6"
 ClimaDiagnostics = "0.2"
 ClimaParams = "0.10.4"
-ClimaTimeSteppers = "0.7.31"
+ClimaTimeSteppers = "0.7.32"
 ClimaUtilities = "0.1.3"
 CloudMicrophysics = "0.18, 0.19, 0.20"
 Colors = "0.12"
@@ -72,7 +72,7 @@ NCDatasets = "0.14.2"
 NVTX = "0.3"
 Pkg = "1.8"
 Printf = "1"
-RRTMGP = "0.14"
+RRTMGP = "0.15"
 Random = "1"
 RootSolvers = "0.2, 0.3, 0.4"
 SciMLBase = "1, 2"

config/default_configs/default_config.yml

@@ -79,7 +79,7 @@ max_newton_iters_ode:
   value: 1
 ode_algo:
   help: "ODE algorithm [`ARS343` (default), `SSP333`, `IMKG343a`, etc.]"
-  value: "ARS343"
+  value: "SSPKnoth"
 krylov_rtol:
   help: "Relative tolerance of the Krylov method (only for ClimaTimeSteppers.jl; only used if `use_krylov_method` is `true`)"
   value: 0.1

config/longrun_configs/amip_target_diagedmf.yml

@@ -14,6 +14,7 @@ dt_cloud_fraction: "1hours"
 idealized_insolation: false
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
+ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml

@@ -10,6 +10,7 @@ rad: "allskywithclear"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
+ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml

@@ -10,6 +10,7 @@ rad: "clearsky"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
+ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml

@@ -10,6 +10,7 @@ rad: "clearsky"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "prognostic_edmfx"
+ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 max_newton_iters_ode: 3

config/longrun_configs/longrun_bw_rhoe_equil_highres.yml

@@ -2,7 +2,7 @@ h_elem: 30
 z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
-dt: "100secs"
+dt: "180secs"
 t_end: "120days"
 initial_condition: "MoistBaroclinicWave"
 moist: "equil"

config/longrun_configs/longrun_bw_rhoe_equil_veryhighres.yml

@@ -0,0 +1,14 @@
+h_elem: 60
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+dt: "100secs"
+t_end: "30days"
+initial_condition: "MoistBaroclinicWave"
+moist: "equil"
+precip_model: "0M"
+dt_save_state_to_disk: "10days"
+netcdf_interpolation_num_points: [360, 180, 2]
+diagnostics:
+  - short_name: [pfull, wa, va, rv, hus, ke]
+    period: 1days

config/longrun_configs/longrun_bw_rhoe_veryhighres.yml

@@ -0,0 +1,12 @@
+h_elem: 60
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+dt: "100secs"
+t_end: "10days"
+initial_condition: "DryBaroclinicWave"
+dt_save_state_to_disk: "10days"
+netcdf_interpolation_num_points: [360, 180, 2]
+diagnostics:
+  - short_name: [pfull, wa, va, rv, ke]
+    period: 1days

config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M.yml

@@ -3,7 +3,7 @@ z_elem: 63
 z_max: 55000.0
 dz_bottom: 30.0
 dz_top: 3000.0
-dt: "100secs"
+dt: "180secs"
 t_end: "300days"
 moist: "equil"
 precip_model: "0M"

config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml

@@ -3,7 +3,7 @@ z_elem: 63
 z_max: 55000.0
 dz_bottom: 30.0
 dz_top: 3000.0
-dt: "100secs"
+dt: "180secs"
 t_end: "300days"
 deep_atmosphere: true
 moist: "equil"

config/model_configs/aquaplanet_diagedmf.yml

@@ -26,3 +26,4 @@ precip_model: 0M
 dt: 100secs 
 t_end: 12hours 
 toml: [toml/diagnostic_edmfx.toml]
+ode_algo: ARS343

config/model_configs/aquaplanet_progedmf.yml

@@ -29,3 +29,4 @@ precip_model: 0M
 dt: 10secs
 t_end: 3hours
 toml: [toml/prognostic_edmfx.toml]
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_aquaplanet.yml

@@ -18,3 +18,4 @@ t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
 toml: [toml/diagnostic_edmfx_0M.toml]
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_bomex_box.yml

@@ -14,8 +14,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "box"
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -33,3 +33,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml

@@ -14,8 +14,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "box"
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -34,3 +34,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml

@@ -14,8 +14,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -33,3 +33,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml

@@ -12,8 +12,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -31,3 +31,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_gabls_box.yml

@@ -12,8 +12,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -31,3 +31,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_rico_box.yml

@@ -15,8 +15,8 @@ edmfx_sgs_diffusive_flux: true
 moist: equil
 apply_limiter: false
 precip_model: "1M"
+call_cloud_diagnostics_per_stage: true
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -36,3 +36,4 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_test_box.yml

@@ -1,6 +1,5 @@
 dt_save_state_to_disk: "10secs"
 x_max: 10000.0
-hyperdiff: "true"
 z_elem: 45
 dt: "1secs"
 t_end: "100secs"
@@ -18,3 +17,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_trmm_box.yml

@@ -12,10 +12,10 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 apply_limiter: false
 precip_model: "1M"
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -36,3 +36,4 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_trmm_box_0M.yml

@@ -12,11 +12,11 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 apply_limiter: false
 precip_model: "0M"
 override_τ_precip: false
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -36,3 +36,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml

@@ -13,11 +13,11 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+call_cloud_diagnostics_per_stage: true
 apply_limiter: false
 precip_model: "1M"
 override_τ_precip: false
 config: box
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
@@ -39,3 +39,4 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
+ode_algo: ARS343

config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml

@@ -17,3 +17,4 @@ precip_model: 1M
 dt: 100secs
 t_end: 6hours
 toml: [toml/diagnostic_edmfx.toml]
+ode_algo: ARS343

config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml

@@ -27,3 +27,4 @@ diagnostics:
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     reduction_time: average
     period: 1hours
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_adv_test_column.yml

@@ -22,3 +22,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
     period: 10mins
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_aquaplanet.yml

@@ -23,3 +23,4 @@ diagnostics:
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     reduction_time: average
     period: 1hours
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_bomex_box.yml

@@ -17,8 +17,8 @@ edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: true
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "box"
-hyperdiff: "true"
 x_max: 1e8
 y_max: 1e8
 z_max: 3e3
@@ -39,3 +39,4 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_bomex_column.yml

@@ -16,6 +16,7 @@ edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: true
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "column"
 z_max: 3e3
 z_elem: 60
@@ -33,3 +34,4 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
     period: 10mins
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_bomex_fixtke_column.yml

@@ -13,6 +13,7 @@ edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: false
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "column"
 z_max: 3e3
 x_elem: 2
@@ -32,3 +33,4 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_bomex_implicit_column.yml

@@ -17,6 +17,7 @@ edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: true
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "column"
 z_max: 3e3
 z_elem: 60
@@ -34,3 +35,4 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
     period: 10mins
+ode_algo: ARS343

config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml

@@ -14,6 +14,7 @@ edmfx_filter: true
 prognostic_tke: true
 cloud_model: "grid_scale"
 moist: "equil"
+call_cloud_diagnostics_per_stage: true
 config: "column"
 z_max: 3e3
 z_elem: 60
@@ -31,3 +32,4 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
+ode_algo: ARS343