prognostic edmf

.buildkite/longruns/pipeline.yml

@@ -1,6 +1,6 @@
 agents:
   queue: new-central
-  slurm_time: 72:00:00
+  slurm_time: 24:00:00
   modules: climacommon/2024_05_27
 
 env:
@@ -13,7 +13,7 @@ env:
   SLURM_KILL_BAD_EXIT: 1
   CONFIG_PATH: "config/longrun_configs"
 
-timeout_in_minutes: 4320
+timeout_in_minutes: 1440
 
 steps:
 
@@ -49,18 +49,18 @@ steps:
 
     steps:
 
-      - label: "GPU AMIP FINE: new target amip: topo + diagedmf"
-        key: "amip_target_topo_diagedmf_gpu"
+      - label: "GPU AMIP FINE: new target amip: topo + progedmf"
+        key: "amip_target_topo_progedmf_gpu"
         command:
           - echo "--- Run simulation"
-          - "srun --cpu-bind=threads --cpus-per-task=4 julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_target_topo_diagedmf_gpu.yml --restart_dir $$RESTART_DIR --restart_t $$RESTART_T --job_id amip_target_topo_diagedmf_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip/amip_target_topo_diagedmf_gpu_artifacts/*"
-        timeout_in_minutes: 4320
+          - "srun --cpu-bind=threads --cpus-per-task=4 julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_target_topo_progedmf_gpu.yml --job_id amip_target_topo_progedmf_gpu"
+        artifact_paths: "experiments/ClimaEarth/output/amip/amip_target_topo_progedmf_gpu_artifacts/*"
+        timeout_in_minutes: 1440
         env:
           CLIMACOMMS_CONTEXT: "MPI"
           CLIMACOMMS_DEVICE: "CUDA"
-          RESTART_DIR: "/scratch/clima/slurm-buildkite/climacoupler-longruns/756/climacoupler-longruns/experiments/ClimaEarth/output/amip/amip_target_topo_diagedmf_gpu_artifacts/"
-          RESTART_T: 46656000
+          # RESTART_DIR: "/scratch/clima/slurm-buildkite/climacoupler-longruns/756/climacoupler-longruns/experiments/ClimaEarth/output/amip/amip_target_topo_diagedmf_gpu_artifacts/"
+          # RESTART_T: 46656000
         agents:
           queue: clima
           slurm_gpus_per_task: 1

config/longrun_configs/amip_target_topo_progedmf_gpu.yml

@@ -0,0 +1,36 @@
+FLOAT_TYPE: "Float32"
+albedo_model: "CouplerAlbedo"
+anim: false
+atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
+turbconv: prognostic_edmfx
+implicit_diffusion: true
+implicit_sgs_advection: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+prognostic_tke: true
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmfx_filter: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+dt: "20secs"
+dt_cpl: 20
+dt_save_state_to_disk: "30days"
+dt_save_to_sol: "30days"
+energy_check: false
+hourly_checkpoint: true
+hourly_checkpoint_dt: 720
+land_albedo_type: "map_temporal"
+mode_name: "amip"
+mono_surface: false
+netcdf_output_at_levels: true
+output_default_diagnostics: true
+start_date: "20100101"
+surface_setup: "PrescribedSurface"
+t_end: "30days"
+topo_smoothing: true
+topography: "Earth"
+coupler_toml_file: "toml/amip_target_topo_progedmf.toml"
+turb_flux_partition: "CombinedStateFluxesMOST"

toml/amip_target_topo_diagedmf.toml

@@ -4,9 +4,6 @@ value = 10.0
 [zd_rayleigh]
 value = 35000.0
 
-[alpha_rayleigh_uh]
-value = 0.0
-
 [precipitation_timescale]
 value = 600
 

toml/amip_target_topo_progedmf.toml

@@ -0,0 +1,44 @@
+[alpha_rayleigh_w]
+value = 10.0
+
+[zd_rayleigh]
+value = 35000.0
+
+[precipitation_timescale]
+value = 600
+
+[EDMF_min_area]
+value = 1.0e-5
+
+[EDMF_max_area]
+value = 0.7
+
+[entr_inv_tau]
+value = 0.0001
+
+[entr_coeff]
+value = 0.1
+
+[min_area_limiter_scale]
+value = 0
+
+[detr_inv_tau]
+value = 0
+
+[detr_coeff]
+value = 0
+
+[detr_buoy_coeff]
+value = 0
+
+[detr_vertdiv_coeff]
+value = 0
+
+[detr_massflux_vertdiv_coeff]
+value = 1
+
+[max_area_limiter_scale]
+value = 0
+
+[pressure_normalmode_drag_coeff]
+value = 40.0