Merge pull request #3795 from CliMA/as/update-defaults

akshaysridhar · web-flow · commit fa043f933f48 · 2025-05-08T20:01:45.000Z
Update default config args
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -162,7 +162,7 @@ steps:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_aquaplanet_allsky_0M_earth"
 
-      - label: ":umbrella: aquaplanet equilmoist allsky radiation + 1M microphysics"
+      - label: ":umbrella: aquaplanet non-equil moisture allsky radiation + 1M microphysics"
         command:
           - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -39,7 +39,7 @@ topography:
   value: "NoWarp"
 mesh_warp_type:
   help: "Sets the interior mesh warp method [`Linear`, `SLEVE`]"
-  value: "Linear"
+  value: "SLEVE"
 sleve_eta:
   help: "If SLEVE coordinates are chosen, sets the `ηₕ` parameter (if z/z_top > ηₕ, no warping is applied)"
   value: 0.7
@@ -146,7 +146,7 @@ vert_diff:
   help: "Vertical diffusion [`false` (default), `VerticalDiffusion`, `true` (defaults to `VerticalDiffusion`), `DecayWithHeightDiffusion`]"
   value: false
 hyperdiff:
-  help: "Hyperdiffusion [`ClimaHyperdiffusion` (or `true`; default), `none` (or `false`)]"
+  help: "Hyperdiffusion [`ClimaHyperdiffusion` (or `true`), `CAM_SE` (default), `none` (or `false`)]"
   value: "CAM_SE"
 smagorinsky_lilly:
   help: "Smagorinsky-Lilly diffusive closure [`false` (default), `true`]"
@@ -164,7 +164,7 @@ test_dycore_consistency:
   help: "Test dycore consistency [`false` (default), `true`]"
   value: false
 dt_save_state_to_disk:
-  help: "Time between saving the state to disk. Examples: [`10secs`, `1hours`, `1months`, `Inf` (do not save)]"
+  help: "Time between saving the state to disk. Examples: [`10secs`, `1hours`, `1months`, `Inf` (do not save, default)]"
   value: "Inf"
 moist:
   help: "Moisture model [`dry` (default), `equil`, `nonequil`]"
@@ -185,7 +185,7 @@ surface_temperature:
   help: "Prescribed surface temperature functional form ['ZonallySymmetric' (default), 'ZonallyAsymmetric', 'RCEMIPII', `Reanalysis`, `ReanalysisTimeVarying`]"
   value: "ZonallySymmetric"
 initial_condition:
-  help: "Initial condition [`DryBaroclinicWave`, `MoistBaroclinicWave`, `ConstantBuoyancyFrequencyProfile`, `DecayingProfile`, `IsothermalProfile`, `Bomex`, `DryDensityCurrentProfile`, `RisingThermalBubbleProfile`, `ISDAC`, `GCM`, `Reanalysis`, `ReanalysisTimeVarying`], or a file path for a NetCDF file (read documentation about requirements)."
+  help: "Initial condition [`DryBaroclinicWave`, `MoistBaroclinicWave`, `ConstantBuoyancyFrequencyProfile`, `DecayingProfile` (default), `IsothermalProfile`, `Bomex`, `DryDensityCurrentProfile`, `RisingThermalBubbleProfile`, `ISDAC`, `GCM`, `Reanalysis`, `ReanalysisTimeVarying`], or a file path for a NetCDF file (read documentation about requirements)."
   value: "DecayingProfile"
 perturb_initstate:
   help: "Add a perturbation to the initial condition [`false`, `true` (default)]"
@@ -212,10 +212,10 @@ viscous_sponge:
   help: "Viscous sponge [`true`, `false` (default)]"
   value: false
 tracer_upwinding:
-  help: "Tracer upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter`]"
+  help: "Tracer upwinding mode [`none`, `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter` (default)]"
   value: vanleer_limiter
 energy_upwinding:
-  help: "Energy upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter`]"
+  help: "Energy upwinding mode [`none`, `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter` (default)]"
   value: vanleer_limiter
 orographic_gravity_wave:
   help: "Orographic drag on horizontal mean flow [`nothing` (default), `gfdl_restart`, `raw_topo`]"
diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 dt_save_state_to_disk: "30days"
diff --git a/config/longrun_configs/amip_target_edonly.yml b/config/longrun_configs/amip_target_edonly.yml
@@ -2,8 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: true
-mesh_warp_type: "SLEVE"
 rayleigh_sponge: true
 viscous_sponge: true
 dt_save_state_to_disk: "30days"
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 topography: "Earth"
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_0M.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
diff --git a/config/model_configs/amip_target_edonly_nonequil.yml b/config/model_configs/amip_target_edonly_nonequil.yml
@@ -2,7 +2,6 @@ h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
-deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 dt_save_state_to_disk: "30days"
diff --git a/config/model_configs/baroclinic_wave.yml b/config/model_configs/baroclinic_wave.yml
@@ -2,7 +2,6 @@ dt_save_state_to_disk: "2days"
 initial_condition: "DryBaroclinicWave"
 dt: "400secs"
 t_end: "10days"
-deep_atmosphere: false
 disable_surface_flux_tendency: true
 diagnostics:
   - short_name: [pfull, ua, wa, va, rv, ta, ke]
diff --git a/config/model_configs/box_cosine_hills_float64_test.yml b/config/model_configs/box_cosine_hills_float64_test.yml
@@ -2,6 +2,7 @@ config: "box"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Cosine3D"
+mesh_warp_type: "Linear"
 x_max: 100e3
 y_max: 25e3
 z_max: 21e3
diff --git a/config/model_configs/extruded_plane_cosine_hills_float64_test.yml b/config/model_configs/extruded_plane_cosine_hills_float64_test.yml
@@ -2,6 +2,7 @@ config: "box"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Cosine2D"
+mesh_warp_type: "Linear"
 x_max: 100e3
 y_max: 1e3
 z_max: 21e3
diff --git a/config/model_configs/plane_agnesi_mountain_float64_test.yml b/config/model_configs/plane_agnesi_mountain_float64_test.yml
@@ -2,6 +2,7 @@ config: "plane"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Agnesi"
+mesh_warp_type: "Linear"
 x_max: 100e3
 z_max: 21e3
 x_elem: 100
diff --git a/config/model_configs/plane_cosine_hills_float64_test.yml b/config/model_configs/plane_cosine_hills_float64_test.yml
@@ -2,6 +2,7 @@ config: "plane"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Cosine2D"
+mesh_warp_type: "Linear"
 x_max: 100e3
 z_max: 21e3
 x_elem: 100
diff --git a/config/model_configs/plane_no_topography_float64_test.yml b/config/model_configs/plane_no_topography_float64_test.yml
@@ -2,6 +2,7 @@ config: "plane"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 discrete_hydrostatic_balance: true
+mesh_warp_type: "Linear"
 x_max: 100e3
 z_max: 21e3
 x_elem: 100
diff --git a/config/model_configs/plane_schar_mountain_float32_test.yml b/config/model_configs/plane_schar_mountain_float32_test.yml
@@ -2,6 +2,7 @@ config: "plane"
 FLOAT_TYPE: "Float32"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Schar"
+mesh_warp_type: "Linear"
 x_max: 100e3
 z_max: 21e3
 x_elem: 100
diff --git a/config/model_configs/plane_schar_mountain_float64_test.yml b/config/model_configs/plane_schar_mountain_float64_test.yml
@@ -2,6 +2,7 @@ config: "plane"
 FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Schar"
+mesh_warp_type: "Linear"
 x_max: 100e3
 z_max: 21e3
 x_elem: 100
