Merge pull request #872 from CliMA/aj/add_1M_run

Add 1M scheme to CI
CliMA · Jun 22, 2024 · 0ef9ccf · 0ef9ccf
2 parents 24062ca + 4504326
commit 0ef9ccf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -509,7 +509,7 @@ steps:
           slurm_mem: 20GB
           slurm_gpus: 1
 
-      - label: "GPU AMIP: albedo from temporal map"
+      - label: "GPU AMIP: albedo from temporal map + 0M"
         key: "gpu_amip_albedo_temporal_map"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_albedo_temporal_map.yml --job_id gpu_amip_albedo_temporal_map"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_albedo_temporal_map_artifacts/*"
@@ -519,6 +519,16 @@ steps:
           slurm_mem: 20GB
           slurm_gpus: 1
 
+      - label: "GPU AMIP: albedo from temporal map + 1M"
+        key: "gpu_amip_albedo_temporal_map_1M"
+        command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_albedo_temporal_map_1M.yml --job_id gpu_amip_albedo_temporal_map_1M"
+        artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_albedo_temporal_map_1M_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_mem: 20GB
+          slurm_gpus: 1
+
   - group: "Bash scripts"
     steps:
       - label: "Submit and Monitor sbatch Job on Caltech HPC"

diff --git a/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml b/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml
@@ -0,0 +1,20 @@
+alpha_rayleigh_uh: 0
+alpha_rayleigh_w: 10
+apply_limiter: false
+dt: "150secs"
+dt_cpl: 150
+dt_rad: "1hours"
+dt_save_to_sol: "1days"
+dz_bottom: 30
+dz_top: 3000
+h_elem: 4
+land_albedo_type: "map_temporal"
+mode_name: "amip"
+moist: "equil"
+precip_model: "1M"
+rad: "gray"
+rayleigh_sponge: true
+t_end: "300secs"
+vert_diff: "true"
+z_elem: 50
+z_stretch: false
diff --git a/experiments/ClimaEarth/components/atmosphere/climaatmos.jl b/experiments/ClimaEarth/components/atmosphere/climaatmos.jl
@@ -52,12 +52,14 @@ function atmos_init(atmos_config)
         ρ_flux_q_tot = integrator.p.precomputed.sfc_conditions.ρ_flux_q_tot
         surface_rain_flux = integrator.p.precipitation.surface_rain_flux
         surface_snow_flux = integrator.p.precipitation.surface_snow_flux
-        ᶜS_ρq_tot = integrator.p.precipitation.ᶜS_ρq_tot
-        ᶜ3d_rain = integrator.p.precipitation.ᶜ3d_rain
-        ᶜ3d_snow = integrator.p.precipitation.ᶜ3d_snow
         @. ρ_flux_q_tot = CC.Geometry.Covariant3Vector(FT(0.0))
         surface_rain_flux .= FT(0)
         surface_snow_flux .= FT(0)
+    end
+    if integrator.p.atmos.precip_model isa CA.Microphysics0Moment
+        ᶜS_ρq_tot = integrator.p.precipitation.ᶜS_ρq_tot
+        ᶜ3d_rain = integrator.p.precipitation.ᶜ3d_rain
+        ᶜ3d_snow = integrator.p.precipitation.ᶜ3d_snow
         ᶜS_ρq_tot .= FT(0)
         ᶜ3d_rain .= FT(0)
         ᶜ3d_snow .= FT(0)