CliMA · charleskawczynski · May 7, 2024 · May 7, 2024 · May 7, 2024 · May 7, 2024
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -445,7 +445,7 @@ steps:
       - label: ":computer: checkbounds"
         command: >
           julia --color=yes --check-bounds=yes --project=perf perf/benchmark.jl
-          $PERF_CONFIG_PATH/checkbounds.yml
+          --config_file $PERF_CONFIG_PATH/checkbounds.yml
         artifact_paths: "checkbounds/output_active/*"
         agents:
           slurm_mem: 20GB
@@ -816,78 +816,78 @@ steps:
       - label: ":computer: Benchmark: perf target (default)"
         command: >
           julia --color=yes --project=perf perf/benchmark.jl
-          $PERF_CONFIG_PATH/bm_perf_target.yml
+          --config_file $PERF_CONFIG_PATH/bm_perf_target.yml
         agents:
           slurm_mem: 24GB
 
       - label: ":computer: Benchmark: perf target (gpu)"
         command: >
           julia --color=yes --project=perf perf/benchmark.jl
-          $PERF_CONFIG_PATH/bm_perf_target.yml
+          --config_file $PERF_CONFIG_PATH/bm_perf_target.yml
         agents:
           slurm_mem: 24GB
           slurm_gpus: 1
 
       - label: ":computer: Benchmark: perf target (Threaded)"
         command: >
           julia --color=yes --threads 8 --project=perf perf/benchmark.jl
-          $PERF_CONFIG_PATH/bm_perf_target_threaded.yml
+          --config_file $PERF_CONFIG_PATH/bm_perf_target_threaded.yml
         agents:
           slurm_mem: 24GB
           slurm_cpus_per_task: 8
 
       - label: ":fire: Flame graph: perf target (default)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target.yml
         artifact_paths: "flame_perf_target/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: perf target (with tracers)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_tracers.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_tracers.yml
         artifact_paths: "flame_perf_target_tracers/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: perf target (diagnostic edmfx)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_diagnostic_edmfx.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_diagnostic_edmfx.yml
         artifact_paths: "flame_perf_target_diagnostic_edmfx/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: perf target (prognostic edmfx aquaplanet)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_prognostic_edmfx_aquaplanet.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_prognostic_edmfx_aquaplanet.yml
         artifact_paths: "flame_perf_target_prognostic_edmfx_aquaplanet/*"
         agents:
           slurm_mem: 48GB
 
       - label: ":fire: Flame graph: perf target (barowave jfnk)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
+          --config_file $PERF_CONFIG_PATH/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
         artifact_paths: "flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff/*"
         agents:
           slurm_mem: 40GB
 
       - label: ":fire: Flame graph: perf target (frierson diffusion)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_frierson.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_frierson.yml
         artifact_paths: "flame_perf_target_frierson/*"
         agents:
           slurm_mem: 48GB
 
       - label: ":fire: Flame graph: perf target (Threaded)"
         command: >
           julia --threads 8 --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_threaded.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_threaded.yml
         artifact_paths: "flame_perf_target_threaded/*"
         agents:
           slurm_cpus_per_task: 8
@@ -896,31 +896,31 @@ steps:
       - label: ":fire: Flame graph: perf target (Callbacks)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_callbacks.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_target_callbacks.yml
         artifact_paths: "flame_perf_target_callbacks/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: gravity wave"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_gw.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_gw.yml
         artifact_paths: "flame_perf_gw/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: perf target (diagnostics)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_diagnostics.yml
+          --config_file $PERF_CONFIG_PATH/flame_perf_diagnostics.yml
         artifact_paths: "flame_perf_diagnostics/*"
         agents:
           slurm_mem: 24GB
 
       - label: ":fire: Flame graph: gpu job"
         command: >
           julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_gpu_implicit_barowave_moist.yml
+          --config_file $PERF_CONFIG_PATH/flame_gpu_implicit_barowave_moist.yml
         artifact_paths: "flame_gpu_implicit_barowave_moist/*"
         agents:
           slurm_mem: 48GB
@@ -931,7 +931,7 @@ steps:
       - label: ":rocket: JET n-failures (inference)"
         command: >
           julia --color=yes --project=perf perf/jet_test_nfailures.jl
-          $PERF_CONFIG_PATH/jet_n_failures.yml
+          --config_file $PERF_CONFIG_PATH/jet_n_failures.yml
         agents:
           slurm_mem: 24GB
 

diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -126,7 +126,7 @@ output_dir:
 device:
   help: "Device type to use [`auto` (default) `CPUSingleThreaded`, `CPUMultiThreaded`, `CUDADevice`]"
   value: "auto"
-reference_job_id:
+reference_config_id:
   help: |-
     Identifier of job to use as the "reference" solution in the quicklook plot; the current job's results get compared to the results of the quicklook job on the main branch
   value: ~
@@ -196,9 +196,6 @@ perf_summary:
 viscous_sponge:
   help: "Viscous sponge [`true`, `false` (default)]"
   value: false
-job_id:
-  help: "Uniquely identifying string for a particular job"
-  value: ~
 tracer_upwinding:
   help: "Tracer upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]"
   value: none
@@ -290,3 +287,46 @@ prescribed_aerosols:
 call_cloud_diagnostics_per_stage:
   help: "A temporary Bool for calling cloud diagnostics every stage"
   value: false
+# EDMF configuration
+turbconv:
+  help: "Turbulence convection scheme [`nothing` (default), 'prognostic_edmfx', 'diagnostic_edmfx']"
+  value: ~
+advection_test:
+  help: "Switches off all grid-scale and subgrid-scale momentum tendencies [`false` (default), `true`]"
+  value: false
+zero_tendency:
+  help: "Turns off tendencies [`nothing` (default), `grid_scale`, `subgrid_scale`]"
+  value: ~
+implicit_sgs_advection:
+  help: "Whether to treat the subgrid-scale vertical advection tendency implicitly [`false` (default), `true`]"
+  value: false
+edmf_coriolis:
+  help: "EDMF coriolis [`nothing` (default), `Bomex`,`LifeCycleTan2018`,`Rico`,`ARM_SGP`,`DYCOMS_RF01`,`DYCOMS_RF02`,`GABLS`]"
+  value: ~
+edmfx_filter:
+  help: "If set to true, it switches on the relaxation of negative velocity in EDMFX.  [`true`, `false` (default)]"
+  value: false
+edmfx_nh_pressure:
+  help: "If set to true, it switches on EDMFX pressure drag closure.  [`true`, `false` (default)]"
+  value: false
+edmfx_entr_model:
+  help: "EDMFX entrainment closure.  [`nothing` (default), `PiGroups`, `Generalized`, `GeneralizedHarmonics`]"
+  value: ~
+edmfx_detr_model:
+  help: "EDMFX detrainment closure.  [`nothing` (default), `PiGroups`, `Generalized`, `GeneralizedHarmonics`]"
+  value: ~
+edmfx_upwinding:
+  help: "EDMFX upwinding mode [`none` (default), `first_order`, `third_order`]"
+  value: none
+edmfx_sgsflux_upwinding:
+  help: "EDMFX SGS mass flux upwinding mode [`none` (default), `first_order`, `third_order`]"
+  value: none
+edmfx_sgs_mass_flux:
+  help: "If set to true, it switches on EDMFX SGS mass flux.  [`true`, `false` (default)]"
+  value: false
+edmfx_sgs_diffusive_flux:
+  help: "If set to true, it switches on EDMFX SGS diffusive flux.  [`true`, `false` (default)]"
+  value: false
+updraft_number:
+  help: "Sets the number of updrafts for the EDMF scheme"
+  value: 1
diff --git a/config/default_configs/default_edmf_config.yml b/config/default_configs/default_edmf_config.yml
diff --git a/config/default_configs/default_perf.yml b/config/default_configs/default_perf.yml
@@ -13,4 +13,4 @@ precip_model: "0M"
 dt_save_to_sol: "Inf"
 rad: "allskywithclear"
 warn_allocations_diagnostics: true
-log_progress: false
+log_progress: false
diff --git a/config/gpu_configs/gpu_aquaplanet_diagedmf.yml b/config/gpu_configs/gpu_aquaplanet_diagedmf.yml
@@ -1,4 +1,3 @@
-job_id: gpu_aquaplanet_diagedmf
 dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml
@@ -19,5 +19,4 @@ surface_setup: DefaultMoninObukhov
 rayleigh_sponge: true
 dt: 100secs
 t_end: 12hours
-job_id: gpu_aquaplanet_dyamond_ss_1process
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml
@@ -19,5 +19,4 @@ surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "12hours"
-job_id: "gpu_aquaplanet_dyamond_ss_2process"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml
@@ -19,5 +19,4 @@ surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "12hours"
-job_id: "gpu_aquaplanet_dyamond_ss_4process"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml
@@ -19,5 +19,4 @@ surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "12hours"
-job_id: "gpu_aquaplanet_dyamond_ws_1process"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml
@@ -19,5 +19,4 @@ surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "12hours"
-job_id: "gpu_aquaplanet_dyamond_ws_2process"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml
@@ -19,5 +19,4 @@ surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "12hours"
-job_id: "gpu_aquaplanet_dyamond_ws_4process"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/gpu_configs/gpu_aquaplanet_progedmf.yml b/config/gpu_configs/gpu_aquaplanet_progedmf.yml
@@ -1,4 +1,3 @@
-job_id: gpu_aquaplanet_progedmf
 dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false

diff --git a/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml b/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml
@@ -13,5 +13,4 @@ moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true
 forcing: "held_suarez"
-job_id: "gpu_hs_rhoe_equil_55km_nz63_0M"
 toml: [toml/longrun_hs_rhoe_equil_55km_nz63_0M.toml]
diff --git a/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M_4process.yml b/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M_4process.yml
@@ -13,5 +13,4 @@ moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true
 forcing: "held_suarez"
-job_id: "gpu_hs_rhoe_equil_55km_nz63_0M_4process"
 toml: [toml/longrun_hs_rhoe_equil_55km_nz63_0M.toml]
diff --git a/config/gpu_configs/target_gpu_implicit_baroclinic_wave.yml b/config/gpu_configs/target_gpu_implicit_baroclinic_wave.yml
@@ -8,4 +8,3 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 dt: "150secs"
-job_id: "target_gpu_implicit_baroclinic_wave"
diff --git a/config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml b/config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml
@@ -8,4 +8,3 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 dt: "150secs"
-job_id: "target_gpu_implicit_baroclinic_wave_4process"
diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
@@ -26,6 +26,5 @@ edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt: "100secs"
 t_end: "40days"
-job_id: "amip_target_diagedmf"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
 netcdf_output_at_levels: true
diff --git a/config/longrun_configs/longrun_aquaplanet_clearsky_1M.yml b/config/longrun_configs/longrun_aquaplanet_clearsky_1M.yml
@@ -14,5 +14,4 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 rad: "clearsky"
 dt_rad: "6hours"
-job_id: "longrun_aquaplanet_clearsky_1M"
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
@@ -15,5 +15,4 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "50secs" 
 t_end: "10days"
-job_id: "longrun_aquaplanet_dyamond" 
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml
@@ -23,5 +23,4 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
 t_end: "60days"
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml
@@ -15,5 +15,4 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 rad: "clearsky"
 dt_rad: "6hours"
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml
@@ -8,7 +8,6 @@ dz_top: 3000.0
 h_elem: 16
 z_elem: 63
 z_max: 55000.0
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth"
 moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth_sleve.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth_sleve.yml
@@ -8,7 +8,6 @@ dz_top: 3000.0
 h_elem: 16
 z_elem: 63
 z_max: 55000.0
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth_sleve"
 moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml
@@ -23,5 +23,4 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
 t_end: "60days"
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml b/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml
@@ -21,5 +21,4 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "30days"
 dt: "100secs"
 t_end: "60days"
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml b/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml
@@ -26,5 +26,4 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
 t_end: "30days"
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.toml]
diff --git a/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml b/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
@@ -20,5 +20,4 @@ albedo_model: "RegressionFunctionAlbedo"
 prognostic_surface: "PrognosticSurfaceTemperature"
 check_conservation: true
 bubble: false
-job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M.toml]