Merge pull request #3201 from CliMA/zs/longrun

clean up longrun

.buildkite/longruns_gpu/pipeline.yml

@@ -61,7 +61,7 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_bw_rhoe_highres"
+          JOB_NAME: "longrun_dry_baroclinic_wave
 
       - label: ":computer: dry baroclinic wave high res"
         command:
@@ -72,7 +72,7 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_bw_rhoe_veryhighres"
+          JOB_NAME: "longrun_dry_baroclinic_wave_he60"
 
       - label: ":computer: baroclinic wave equilmoist"
         command:
@@ -83,7 +83,7 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_bw_rhoe_equil_highres"
+          JOB_NAME: "longrun_moist_baroclinic_wave"
 
       - label: ":computer: baroclinic wave equilmoist high res"
         command:
@@ -94,7 +94,7 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_bw_rhoe_equil_veryhighres"
+          JOB_NAME: "longrun_moist_baroclinic_wave_he60"
 
       - label: ":computer: dry held-suarez"
         command:
@@ -105,7 +105,7 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_hs_rhoe_dry_55km_nz63"
+          JOB_NAME: "longrun_dry_held_suarez"
 
       - label: ":computer: held-suarez, equilmoist"
         command:
@@ -116,120 +116,87 @@ steps:
           slurm_time: 12:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M"
+          JOB_NAME: "longrun_moist_held_suarez"
 
       - label: ":computer: held-suarez equilmoist + deep-atmosphere eqns"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos"
+          JOB_NAME: "longrun_moist_held_suarez_deepatmos"
         agents:
           slurm_gpus: 1
           slurm_time: 12:00:00
 
   - group: "helem 16 aquaplanet"
     steps:
 
-      - label: ":computer: aquaplanet equilmoist gray radiation + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + 0M microphysics"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M"
-
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + diagnostic edmf + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M"
+          JOB_NAME: "longrun_aquaplanet_allsky_0M"
 
       - label: ":computer: aquaplanet equilmoist allsky radiation + diagnostic edmf + 0M microphysics"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M"
+          JOB_NAME: "longrun_aquaplanet_allsky_diagedmf_0M"
 
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + prognostic edmf diffusion only + 0M microphysics"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + prognostic edmf diffusion only + 0M microphysics"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
-
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + 0M microphysics + earth topography"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth"
+          JOB_NAME: "longrun_aquaplanet_allsky_progedmf_diffonly_0M"
 
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + 0M microphysics + earth topography (SLEVE)"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics + earth topography"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 6:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth_sleve"
+          JOB_NAME: "longrun_aquaplanet_allsky_0M_earth"
 
-      - label: ":umbrella: aquaplanet equilmoist clearsky radiation + 1M microphysics"
+      - label: ":umbrella: aquaplanet equilmoist allsky radiation + 1M microphysics"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 6:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_clearsky_1M"
+          JOB_NAME: "longrun_aquaplanet_allsky_1M"
 
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + time-varying insolation + 0M microphysics + slab ocean"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + time-varying insolation + 0M microphysics + slab ocean"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean"
+          JOB_NAME: "longrun_aquaplanet_allsky_tvinsol_0M_slabocean"
 
   - group: "DYAMOND"
 
@@ -241,7 +208,7 @@ steps:
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_aquaplanet_dyamond"
@@ -256,7 +223,7 @@ steps:
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
           slurm_gpus: 1
-          slurm_time: 12:00:00
+          slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "amip_target_diagedmf"

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml → config/longrun_configs/longrun_aquaplanet_allsky_0M.yml

@@ -1,6 +1,6 @@
 dt_save_state_to_disk: "10days"
 dt: "120secs"
-t_end: "300days"
+t_end: "360days"
 h_elem: 16
 z_elem: 63
 dz_bottom: 30.0
@@ -13,6 +13,6 @@ surface_setup: "DefaultMoninObukhov"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-rad: "clearsky"
+rad: "allskywithclear"
 dt_rad: "6hours"
 toml: [toml/longrun_aquaplanet.toml]

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml → config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml

@@ -1,8 +1,8 @@
 dt_save_state_to_disk: "10days"
 dt: "120secs"
-rad: "clearsky"
+rad: "allskywithclear"
 dt_rad: "6hours"
-t_end: "480days"
+t_end: "360days"
 dz_bottom: 30.0
 dz_top: 3000.0
 h_elem: 16
@@ -11,7 +11,6 @@ z_max: 55000.0
 moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true
-smoothing_order: 2
 topo_smoothing: true
 topography: "Earth"
 surface_setup: "DefaultMoninObukhov"

config/longrun_configs/longrun_aquaplanet_clearsky_1M.yml → config/longrun_configs/longrun_aquaplanet_allsky_1M.yml

@@ -1,5 +1,5 @@
 dt: "120secs"
-t_end: "120days"
+t_end: "360days"
 h_elem: 16
 z_elem: 63
 dz_bottom: 30.0
@@ -12,6 +12,6 @@ surface_setup: "DefaultMoninObukhov"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-rad: "clearsky"
+rad: "allskywithclear"
 dt_rad: "6hours"
 toml: [toml/longrun_aquaplanet.toml]

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml → config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml

@@ -24,5 +24,5 @@ edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
-t_end: "120days"
+t_end: "240days"
 toml: [toml/longrun_aquaplanet.toml]

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml → config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml

@@ -6,7 +6,7 @@ dz_top: 3000.0
 moist: "equil"
 precip_model: "0M"
 override_τ_precip: false
-rad: "clearsky"
+rad: "allskywithclear"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "prognostic_edmfx"
@@ -26,5 +26,5 @@ edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
-t_end: "120days"
+t_end: "240days"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.toml]

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml → config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml

@@ -1,6 +1,6 @@
 dt_save_state_to_disk: "10days"
 dt: "150secs"
-t_end: "120days"
+t_end: "360days"
 h_elem: 16
 z_elem: 63
 dz_bottom: 30.0
@@ -13,7 +13,7 @@ surface_setup: "DefaultMoninObukhov"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-rad: "clearsky"
+rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 albedo_model: "RegressionFunctionAlbedo"