Merge pull request #1527 from CliMA/zs/longrun

clean up longruns

Author: szy21

.buildkite/longruns/pipeline.yml

@@ -62,13 +62,6 @@ steps:
         agents:
           slurm_mem: 32GB
 
-      - label: "Slabplanet: fixed ocean T, bucket"
-        key: "slabplanet_fixed_ocean"
-        command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_fixed_ocean.yml --job_id slabplanet_fixed_ocean"
-        artifact_paths: "experiments/ClimaEarth/output/slabplanet_fixed_ocean/artifacts/*"
-        agents:
-          slurm_mem: 32GB
-
       - label: "Slabplanet: evolving slab ocean, bucket"
         key: "slabplanet_evolve_ocean"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_evolve_ocean.yml --job_id slabplanet_evolve_ocean"
@@ -79,33 +72,6 @@ steps:
   - group: "AMIP simulations"
 
     steps:
-      - label: "GPU AMIP + DecayWithHeight diffusion"
-        key: "amip_decaywithheight_gpu"
-        command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_decaywithheight.yml --job_id amip_decaywithheight_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_decaywithheight_gpu/artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
-          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 + DecayWithHeight diffusion + integrated land"
-        key: "amip_decaywithheight_integrated_land_gpu"
-        command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_decaywithheight_integrated_land.yml --job_id amip_decaywithheight_integrated_land_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_decaywithheight_integrated_land_gpu/artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
-          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 + ED only"
         key: "amip_edonly_gpu"
@@ -120,7 +86,7 @@ steps:
           slurm_cpus_per_task: 4
           slurm_ntasks: 1
           slurm_mem: 32GB
-
+      
       - label: "GPU AMIP + ED only + 1M microphysics"
         key: "amip_edonly_1M_gpu"
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_edonly_1M.yml --job_id amip_edonly_1M_gpu"
@@ -135,24 +101,10 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 32GB
 
-      - label: "GPU AMIP + ED only + Earth topography"
-        key: "amip_edonly_topo_gpu"
-        command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_edonly_topo.yml --job_id amip_edonly_topo_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_edonly_topo_gpu/artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
-          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 + ED only + Earth topography + integrated land"
-        key: "amip_edonly_topo_integrated_land_gpu" # runs for 4 months only because of instability after that time
-        command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_edonly_topo_integrated_land.yml --job_id amip_edonly_topo_integrated_land_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_edonly_topo_integrated_land_gpu/artifacts/*"
+      - label: "GPU AMIP + ED only + integrated land"
+        key: "amip_edonly_integrated_land_gpu" # runs for 4 months only because of instability after that time
+        command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_edonly_integrated_land.yml --job_id amip_edonly_integrated_land_gpu"
+        artifact_paths: "experiments/ClimaEarth/output/amip_edonly_integrated_land_gpu/artifacts/*"
         env:
           CLIMACOMMS_CONTEXT: "MPI"
           CLIMACOMMS_DEVICE: "CUDA"
@@ -163,11 +115,11 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 32GB
 
-      - label: "GPU AMIP + diag. EDMF + Earth topography"
-        key: "amip_diagedmf_topo_gpu"
+      - label: "GPU AMIP + diag. EDMF"
+        key: "amip_diagedmf_gpu"
         command:
-          - "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_diagedmf_topo.yml --job_id amip_diagedmf_topo_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_diagedmf_topo_gpu/artifacts/*"
+          - "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_diagedmf.yml --job_id amip_diagedmf_gpu"
+        artifact_paths: "experiments/ClimaEarth/output/amip_diagedmf_gpu/artifacts/*"
         env:
           CLIMACOMMS_CONTEXT: "MPI"
           CLIMACOMMS_DEVICE: "CUDA"
@@ -178,11 +130,11 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 32GB
 
-      - label: "GPU AMIP + diag. EDMF + Earth topography + integrated land"
-        key: "amip_diagedmf_topo_integrated_land_gpu" # runs for 2 months only because of instability after that time
+      - label: "GPU AMIP + diag. EDMF + integrated land"
+        key: "amip_diagedmf_integrated_land_gpu" # runs for 2 months only because of instability after that time
         command:
-          - "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_diagedmf_topo_integrated_land.yml --job_id amip_diagedmf_topo_integrated_land_gpu"
-        artifact_paths: "experiments/ClimaEarth/output/amip_diagedmf_topo_integrated_land_gpu/artifacts/*"
+          - "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_diagedmf_integrated_land.yml --job_id amip_diagedmf_integrated_land_gpu"
+        artifact_paths: "experiments/ClimaEarth/output/amip_diagedmf_integrated_land_gpu/artifacts/*"
         env:
           CLIMACOMMS_CONTEXT: "MPI"
           CLIMACOMMS_DEVICE: "CUDA"

config/longrun_configs/amip_decaywithheight.yml

@@ -1,5 +1,6 @@
 FLOAT_TYPE: "Float32"
 aerosol_radiation: true
+albedo_model: "CouplerAlbedo"
 atmos_config_file: "config/atmos_configs/climaatmos_edonly.yml"
 bucket_albedo_type: "map_temporal"
 checkpoint_dt: "93days"
@@ -11,9 +12,12 @@ dt_rad: "1hours"
 energy_check: false
 insolation: "timevarying"
 mode_name: "amip"
+netcdf_interpolate_z_over_msl: true
 prescribe_ozone: true
 prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 rmse_check: true
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "366days"
+topo_smoothing: true
+topography: "Earth"

config/longrun_configs/amip_decaywithheight_integrated_land.yml

@@ -19,3 +19,5 @@ rmse_check: true
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "366days"
+topo_smoothing: true
+topography: "Earth"