add test: aquaplanet with 2M; also fixing short names

Author: sajjadazimi

.buildkite/pipeline.yml

@@ -94,6 +94,17 @@ steps:
           --job_id single_column_precipitation_2M_test
         artifact_paths: "single_column_precipitation_2M_test/output_active/*"
 
+      - label: ":umbrella: 2-moment precipitation aquaplanet nonequil allsky"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $CONFIG_PATH/aquaplanet_nonequil_allsky_2M.yml
+          --job_id aquaplanet_nonequil_allsky_2M
+
+        artifact_paths: "aquaplanet_nonequil_allsky_2M/output_active/*"
+        agents:
+          slurm_mem: 20GB
+          slurm_constraint: icelake|cascadelake|skylake|epyc
+
   - group: "Gravity wave"
     steps:
 

config/model_configs/aquaplanet_nonequil_allsky_2M.yml

@@ -0,0 +1,29 @@
+z_max: 60000.0
+z_elem: 31
+dz_bottom: 50.0
+rayleigh_sponge: true
+dt: "360secs"
+t_end: "1days"
+dt_save_state_to_disk: "24hours"
+vert_diff: "DecayWithHeightDiffusion"
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+moist: "nonequil"
+precip_model: "2M"
+rad: "allskywithclear"
+aerosol_radiation: true
+prescribe_clouds_in_radiation: true
+radiation_reset_rng_seed: true
+insolation: "timevarying"
+non_orographic_gravity_wave: true
+orographic_gravity_wave: "gfdl_restart"
+surface_setup: "DefaultMoninObukhov"
+prescribe_ozone: true
+reproducibility_test: true
+prescribed_aerosols: ["SO4", "CB1", "OC1", "DST01", "SSLT01"]
+diagnostics:
+  - short_name: [edt, evu, mmrso4, mmrbcpo, mmrocpo, mmrdust, mmrss, loadss, o3, od550aer, odsc550aer]
+    reduction_time: average
+    period: 1days
+  - short_name: [reffclw, reffcli]
+    period: 6hours

config/model_configs/single_column_precipitation_2M_test.yml

@@ -16,7 +16,7 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 reproducibility_test: false
 diagnostics:
-  - short_name: [hus, clw, cli, husra, hussn, clwnm, clinm, nmra, nmsn, ta, wa]
+  - short_name: [hus, clw, cli, husra, hussn, cdnc, cdinc, ncra, ncsn, ta, wa]
     period: 500secs
   - short_name: [pr]
     period: 10secs

post_processing/ci_plots.jl

@@ -644,10 +644,10 @@ function make_plots(
             "husra",
             "hussn",
             "ta",
-            "clwnm",
-            "clinm",
-            "nmra",
-            "nmsn",
+            "cdnc",
+            "cdinc",
+            "ncra",
+            "ncsn",
         ]
         figsize = (1200, 1000)
         pr_row = 5
@@ -1153,6 +1153,7 @@ AquaplanetPlots = Union{
     Val{:edonly_edmfx_aquaplanet},
     Val{:mpi_sphere_aquaplanet_rhoe_equil_clearsky},
     Val{:aquaplanet_nonequil_allsky_gw_res},
+    Val{:aquaplanet_nonequil_allsky_2M},
     Val{:rcemipii_sphere_diagnostic_edmfx},
     Val{:longrun_aquaplanet_allsky_0M},
     Val{:longrun_aquaplanet_allsky_diagedmf_0M},

src/diagnostics/core_diagnostics.jl

@@ -860,12 +860,12 @@ add_diagnostic_variable!(
     compute! = compute_hussn!,
 )
 
-compute_clwnm!(out, state, cache, time) =
-    compute_clwnm!(out, state, cache, time, cache.atmos.precip_model)
-compute_clwnm!(_, _, _, _, model::T) where {T} =
-    error_diagnostic_variable("clwnm", model)
+compute_cdnc!(out, state, cache, time) =
+    compute_cdnc!(out, state, cache, time, cache.atmos.precip_model)
+compute_cdnc!(_, _, _, _, model::T) where {T} =
+    error_diagnostic_variable("cdnc", model)
 
-function compute_clwnm!(
+function compute_cdnc!(
     out,
     state,
     cache,
@@ -880,23 +880,23 @@ function compute_clwnm!(
 end
 
 add_diagnostic_variable!(
-    short_name = "clwnm",
-    long_name = "Number Concentration of Cloud Liquid Water",
-    standard_name = "number_concentration_of_cloud_liquid_water",
-    units = "1 m^-3",
+    short_name = "cdnc",
+    long_name = "Cloud Liquid Droplet Number Concentration",
+    standard_name = "number_concentration_of_cloud_liquid_water_particles_in_air",
+    units = "m^-3",
     comments = """
     This is calculated as the number of cloud liquid water droplets in the grid 
     cell divided by the cell volume.
     """,
-    compute! = compute_clwnm!,
+    compute! = compute_cdnc!,
 )
 
-compute_clinm!(out, state, cache, time) =
-    compute_clinm!(out, state, cache, time, cache.atmos.precip_model)
-compute_clinm!(_, _, _, _, model::T) where {T} =
-    error_diagnostic_variable("clinm", model)
+compute_cdinc!(out, state, cache, time) =
+    compute_cdinc!(out, state, cache, time, cache.atmos.precip_model)
+compute_cdinc!(_, _, _, _, model::T) where {T} =
+    error_diagnostic_variable("cdinc", model)
 
-function compute_clinm!(
+function compute_cdinc!(
     out,
     state,
     cache,
@@ -911,23 +911,23 @@ function compute_clinm!(
 end
 
 add_diagnostic_variable!(
-    short_name = "clinm",
-    long_name = "Number Concentration of Cloud Ice",
-    standard_name = "number_concentration_of_cloud_ice",
-    units = "1 m^-3",
+    short_name = "cdinc",
+    long_name = "Cloud Ice Chrystal Number Concentration",
+    standard_name = "number_concentration_of_cloud_ice_chrystals_in_air",
+    units = "m^-3",
     comments = """
     This is calculated as the number of cloud ice chrystals in the grid 
     cell divided by the cell volume.
     """,
-    compute! = compute_clinm!,
+    compute! = compute_cdinc!,
 )
 
-compute_nmra!(out, state, cache, time) =
-    compute_nmra!(out, state, cache, time, cache.atmos.precip_model)
-compute_nmra!(_, _, _, _, model::T) where {T} =
-    error_diagnostic_variable("nmra", model)
+compute_ncra!(out, state, cache, time) =
+    compute_ncra!(out, state, cache, time, cache.atmos.precip_model)
+compute_ncra!(_, _, _, _, model::T) where {T} =
+    error_diagnostic_variable("ncra", model)
 
-function compute_nmra!(
+function compute_ncra!(
     out,
     state,
     cache,
@@ -942,23 +942,23 @@ function compute_nmra!(
 end
 
 add_diagnostic_variable!(
-    short_name = "nmra",
-    long_name = "Number Concentration of Rain",
-    standard_name = "number_concentration_of_rain",
-    units = "1 m^-3",
+    short_name = "ncra",
+    long_name = "Raindrop Number Concentration",
+    standard_name = "number_concentration_of_raindrops_in_air",
+    units = "m^-3",
     comments = """
     This is calculated as the number of raindrops in the grid cell divided
     by the cell volume.
     """,
-    compute! = compute_nmra!,
+    compute! = compute_ncra!,
 )
 
-compute_nmsn!(out, state, cache, time) =
-    compute_nmsn!(out, state, cache, time, cache.atmos.precip_model)
-compute_nmsn!(_, _, _, _, model::T) where {T} =
-    error_diagnostic_variable("nmsn", model)
+compute_ncsn!(out, state, cache, time) =
+    compute_ncsn!(out, state, cache, time, cache.atmos.precip_model)
+compute_ncsn!(_, _, _, _, model::T) where {T} =
+    error_diagnostic_variable("ncsn", model)
 
-function compute_nmsn!(
+function compute_ncsn!(
     out,
     state,
     cache,
@@ -973,15 +973,15 @@ function compute_nmsn!(
 end
 
 add_diagnostic_variable!(
-    short_name = "nmsn",
-    long_name = "Number Concentration of Snow",
-    standard_name = "number_concentration_of_snow",
-    units = "1 m^-3",
+    short_name = "ncsn",
+    long_name = "Snowflake Number Concentration",
+    standard_name = "number_concentration_of_snowflakes_in_air",
+    units = "m^-3",
     comments = """
     This is calculated as the number of snow flakes in the grid cell divided
     by the cell volume.
     """,
-    compute! = compute_nmsn!,
+    compute! = compute_ncsn!,
 )
 
 ###

src/diagnostics/default_diagnostics.jl

@@ -236,7 +236,7 @@ function default_diagnostics(
     start_date;
     output_writer,
 )
-    precip_diagnostics = ["husra", "hussn", "clwnm", "clinm", "nmra", "nmsn"]
+    precip_diagnostics = ["husra", "hussn", "cdnc", "cdinc", "ncra", "ncsn"]
 
     average_func = frequency_averages(duration)