remove diagnostic edmf 1M runs

.buildkite/amip/pipeline.yml

@@ -36,7 +36,7 @@ steps:
 
     steps:
 
-      - label: "Current AMIP: diagedmf + 0M + integrated land"
+      - label: "Current AMIP: progedmf + 0M + integrated land"
         key: "amip"
         command:
           - echo "--- Run simulation"

.buildkite/longruns/pipeline.yml

@@ -107,25 +107,11 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 32GB
 
-      - label: "GPU AMIP + diag. EDMF + integrated land + 2K SST"
-        key: "amip_diagedmf_land_p2k"
-        command:
-          - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_diagedmf_land_p2k.yml --job_id amip_diagedmf_land_p2k"
-        artifact_paths: "output/amip_diagedmf_land_p2k/artifacts/*"
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-        agents:
-          queue: clima
-          slurm_gpus_per_task: 1
-          slurm_cpus_per_task: 4
-          slurm_ntasks: 1
-          slurm_mem: 32GB
-
-      - label: "GPU AMIP + diag. EDMF + 1M + integrated land"
-        key: "amip_diagedmf_1m_land"
+      - label: "GPU AMIP + prog. EDMF + integrated land"
+        key: "amip_progedmf_land"
         command:
-          - "julia --threads=3 --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_diagedmf_1m_land.yml --job_id amip_diagedmf_1m_land"
-        artifact_paths: "output/amip_diagedmf_1m_land/artifacts/*"
+          - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_progedmf_land.yml --job_id amip_progedmf_land"
+        artifact_paths: "output/amip_progedmf_land/artifacts/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
@@ -134,12 +120,12 @@ steps:
           slurm_cpus_per_task: 4
           slurm_ntasks: 1
           slurm_mem: 32GB
-
-      - label: "GPU AMIP + prog. EDMF + integrated land"
-        key: "amip_progedmf_land"
+      
+      - label: "GPU AMIP + prog. EDMF + integrated land + 2K SST"
+        key: "amip_progedmf_land_p2k"
         command:
-          - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_progedmf_land.yml --job_id amip_progedmf_land"
-        artifact_paths: "output/amip_progedmf_land/artifacts/*"
+          - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_progedmf_land_p2k.yml --job_id amip_progedmf_land_p2k"
+        artifact_paths: "output/amip_progedmf_land_p2k/artifacts/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
@@ -226,8 +212,8 @@ steps:
         command: >-
           julia --color=yes --project=experiments/AMIP/
             test/cess_climate_sensitivity.jl
-            output/amip_diagedmf_land
-            output/amip_diagedmf_land_p2k
+            output/amip_progedmf_land
+            output/amip_progedmf_land_p2k
             output/ecs_analysis
         artifact_paths: "output/ecs_analysis/*"
 

.buildkite/nightly/pipeline.yml

@@ -62,21 +62,6 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 30GB
 
-      - label: "Coarse current AMIP: diagedmf + 1M + integrated land"
-        key: "amip_diagedmf_1m_land"
-        command:
-          - echo "--- Run simulation"
-          - "julia --threads=3 --color=yes --project=experiments/AMIP/ experiments/AMIP/run_simulation.jl --config_file $CONFIG_PATH/amip_coarse_diagedmf_1m_land.yml --job_id amip_coarse_diagedmf_1m_land"
-        artifact_paths: "output/amip_coarse_diagedmf_1m_land/artifacts/*"
-        timeout_in_minutes: 840
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-        agents:
-          slurm_gpus_per_task: 1
-          slurm_cpus_per_task: 4
-          slurm_ntasks: 1
-          slurm_mem: 30GB
-
       - label: "Coarse current AMIP: progedmf + 0M + integrated land"
         key: "amip_progedmf_land"
         command:

config/longrun_configs/amip_diagedmf_land_p2k.yml → config/longrun_configs/amip_progedmf_land_p2k.yml

@@ -1,26 +1,22 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
-atmos_config_file: "config/atmos_configs/climaatmos_diagedmf.yml"
-bucket_albedo_type: "map_temporal"
+atmos_config_file: "config/atmos_configs/climaatmos_progedmf.yml"
 checkpoint_dt: "1months"
-coupler_toml: ["toml/amip_diagedmf.toml"]
+coupler_toml: ["toml/amip_progedmf.toml"]
 dt: "120secs"
-dt_cloud_fraction: "1hours"
 dt_cpl: "120secs"
-dt_rad: "1hours"
 energy_check: false
 extra_atmos_diagnostics:
   - short_name: [hur, hus, ta]
     period: 1months
     reduction_time: average
     pressure_coordinates: true
     compute_every: 6hours
-initial_condition: "AMIPFromERA5"
 land_model: "integrated"
 mode_name: "amip"
 netcdf_output_at_levels: true
 output_default_diagnostics: true
-rmse_check: true
+radiation_reset_rng_seed: true
 sst_adjustment: 2.0
 start_date: "20100101"
 surface_setup: "PrescribedSurface"