Merge pull request #1560 from CliMA/zs/gcp

modify amip on gcp

Author: szy21

.buildkite/gcp/pipeline.yml

@@ -40,34 +40,32 @@ steps:
             --config_file $CONFIG_PATH/amip.yml \
             --job_id amip
         artifact_paths: "experiments/ClimaEarth/output/amip/artifacts/*"
-        timeout_in_minutes: 5760
+        timeout_in_minutes: 7220
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
-          slurm_gpus_per_task: 1
+          slurm_gpus: 1
           slurm_cpus_per_task: 4
           slurm_ntasks: 1
           slurm_mem: 30GB
-          slurm_time: "60:00:00"
-
-      - label: "10-year 30 h_elem current AMIP: diagedmf + 0M + bucket land"
-        key: "10year_amip"
+          slurm_time: "120:00:00"
+      
+      - label: "Current AMIP: diagedmf + 0M + integrated land"
+        key: "amip_land"
         command:
-
           - echo "--- Run simulation"
           - |
-            mpiexec -n 8 julia --threads=4 --color=yes \
-                    --project=experiments/ClimaEarth/ \
-                    experiments/ClimaEarth/run_amip.jl \
-                    --config_file config/longrun_configs/amip_diagedmf_10years.yml \
-                    --job_id amip_30_h_elem
-        artifact_paths: "experiments/ClimaEarth/output/amip_coarse/artifacts/*"
+            julia --threads=3 --color=yes --project=experiments/ClimaEarth/ \
+            experiments/ClimaEarth/run_amip.jl \
+            --config_file $CONFIG_PATH/amip_land.yml \
+            --job_id amip_land
+        artifact_paths: "experiments/ClimaEarth/output/amip_land/artifacts/*"
+        timeout_in_minutes: 7220
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
-          slurm_gpus: 8
+          slurm_gpus: 1
           slurm_cpus_per_task: 4
-          slurm_ntasks: 8
-          slurm_mem: 0GB
-          slurm_time: "336:00:00"
+          slurm_ntasks: 1
+          slurm_mem: 30GB
+          slurm_time: "120:00:00"

…ongrun_configs/amip_diagedmf_10years.yml config/amip_configs/amip_land.ymlconfig/longrun_configs/amip_diagedmf_10years.yml renamed to config/amip_configs/amip_land.yml config/longrun_configs/amip_diagedmf_10years.yml renamed to config/amip_configs/amip_land.yml

@@ -1,25 +1,18 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
 atmos_config_file: "config/atmos_configs/climaatmos_diagedmf.yml"
-bucket_albedo_type: "map_temporal"
 checkpoint_dt: "366days"
-co2_model: "maunaloa"
 coupler_toml: ["toml/amip.toml"]
 dt: "120secs"
 dt_cpl: "120secs"
-dz_bottom: 30.0
 energy_check: false
-h_elem: 30
+land_model: "integrated"
 mode_name: "amip"
 netcdf_output_at_levels: true
 output_default_diagnostics: true
 radiation_reset_rng_seed: true
-rayleigh_sponge: true
-start_date: "20000401"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
-t_end: "3670days"
+t_end: "1098days"
 topo_smoothing: true
 topography: "Earth"
-viscous_sponge: true
-z_elem: 63
-z_max: 60000.0