test different aerosols

.buildkite/longruns_gpu/pipeline.yml

@@ -142,6 +142,17 @@ steps:
         env:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_aquaplanet_allsky_0M"
+
+      - 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: 24:00:00
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+          JOB_NAME: "longrun_aquaplanet_allsky_0M_bc"
 
   #     - label: ":computer: aquaplanet equilmoist allsky radiation + diagnostic edmf + 0M microphysics"
   #       command:

config/longrun_configs/longrun_aquaplanet_allsky_0M.yml

@@ -16,10 +16,10 @@ dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
 vert_diff: "FriersonDiffusion"
 precip_model: "0M"
-prescribed_aerosols: ["SSLT01"]
+prescribed_aerosols: ["SO4", "CB1", "CB2", "OC1", "OC2", "DST01"]
 aerosol_radiation: true
 toml: [toml/longrun_aquaplanet.toml]
 diagnostics:
-  - short_name: [mmrss]
+  - short_name: [mmrso4, mmrbcpo, mmrbcpi, mmrocpo, mmrocpi, mmrdust]
     reduction_time: average
     period: "1months"

config/longrun_configs/longrun_aquaplanet_allsky_0M_bc.yml

@@ -0,0 +1,25 @@
+h_elem: 16
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+rayleigh_sponge: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+dt: "120secs"
+t_end: "100days"
+dt_save_state_to_disk: "10days"
+moist: "equil"
+rad: "allskywithclear"
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+precip_model: "0M"
+prescribed_aerosols: ["CB1", "CB2"]
+aerosol_radiation: true
+toml: [toml/longrun_aquaplanet.toml]
+diagnostics:
+  - short_name: [mmrbcpo, mmrbcpi]
+    reduction_time: average
+    period: "1months"

config/longrun_configs/longrun_aquaplanet_allsky_0M_dust.yml

@@ -0,0 +1,25 @@
+h_elem: 16
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+rayleigh_sponge: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+dt: "120secs"
+t_end: "100days"
+dt_save_state_to_disk: "10days"
+moist: "equil"
+rad: "allskywithclear"
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+precip_model: "0M"
+prescribed_aerosols: ["DST01"]
+aerosol_radiation: true
+toml: [toml/longrun_aquaplanet.toml]
+diagnostics:
+  - short_name: [mmrdust]
+    reduction_time: average
+    period: "1months"

config/longrun_configs/longrun_aquaplanet_allsky_0M_oc.yml

@@ -0,0 +1,25 @@
+h_elem: 16
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+rayleigh_sponge: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+dt: "120secs"
+t_end: "100days"
+dt_save_state_to_disk: "10days"
+moist: "equil"
+rad: "allskywithclear"
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+precip_model: "0M"
+prescribed_aerosols: ["OC1", "OC2"]
+aerosol_radiation: true
+toml: [toml/longrun_aquaplanet.toml]
+diagnostics:
+  - short_name: [mmrocpo, mmrocpi]
+    reduction_time: average
+    period: "1months"

config/longrun_configs/longrun_aquaplanet_allsky_0M_so4.yml

@@ -0,0 +1,25 @@
+h_elem: 16
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+rayleigh_sponge: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+dt: "120secs"
+t_end: "100days"
+dt_save_state_to_disk: "10days"
+moist: "equil"
+rad: "allskywithclear"
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+precip_model: "0M"
+prescribed_aerosols: ["SO4"]
+aerosol_radiation: true
+toml: [toml/longrun_aquaplanet.toml]
+diagnostics:
+  - short_name: [mmrso4]
+    reduction_time: average
+    period: "1months"

examples/Manifest.toml

@@ -2137,8 +2137,8 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.RRTMGP]]
 deps = ["Adapt", "Artifacts", "ClimaComms", "DocStringExtensions", "Random"]
-git-tree-sha1 = "86a9005d840a332cda9d6239085f002e2f03878b"
-repo-rev = "zs/limit_tau"
+git-tree-sha1 = "9daa7af64af9c20531b0fae7d0d9473d11a7bc5d"
+repo-rev = "main"
 repo-url = "https://github.com/CliMA/RRTMGP.jl.git"
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
 version = "0.18.0"

src/callbacks/callbacks.jl

@@ -179,9 +179,9 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
                 (:center_ocpo_column_mass_density, :OC1),
             ]
 
-            for (aerosol_name, prescribed_aerosol_name) in aerosol_names_pair
+            for (rrtmgp_aerosol_name, prescribed_aerosol_name) in aerosol_names_pair
                 ᶜaero_conc = Fields.array2field(
-                    getproperty(rrtmgp_model, aerosol_name),
+                    getproperty(rrtmgp_model, rrtmgp_aerosol_name),
                     axes(Y.c),
                 )
                 if prescribed_aerosol_name in
@@ -190,7 +190,7 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
                         p.tracers.prescribed_aerosols_field,
                         prescribed_aerosol_name,
                     )
-                    @. ᶜaero_conc = aerosol_field * ᶜΔz
+                    @. ᶜaero_conc = aerosol_field * Y.c.ρ * ᶜΔz
                 else
                     @. ᶜaero_conc = 0
                 end