Encapsulate rrtmgp model kwargs

Author: charleskawczynski

src/callbacks/callbacks.jl

@@ -229,25 +229,20 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
 
     if !(radiation_mode isa RRTMGPI.GrayRadiation)
         if radiation_mode.aerosol_radiation
-            _update_some_aerosol_conc(Y, p)
             ᶜΔz = Fields.Δz_field(Y.c)
 
-            if pkgversion(RRTMGP) <= v"0.19.2"
-                more_aerosols = ()
-            else
-                more_aerosols = (
-                    (:center_dust1_column_mass_density, :DST01),
-                    (:center_dust2_column_mass_density, :DST02),
-                    (:center_dust3_column_mass_density, :DST03),
-                    (:center_dust4_column_mass_density, :DST04),
-                    (:center_dust5_column_mass_density, :DST05),
-                    (:center_ss1_column_mass_density, :SSLT01),
-                    (:center_ss2_column_mass_density, :SSLT02),
-                    (:center_ss3_column_mass_density, :SSLT03),
-                    (:center_ss4_column_mass_density, :SSLT04),
-                    (:center_ss5_column_mass_density, :SSLT05),
-                )
-            end
+            more_aerosols = (
+                (:center_dust1_column_mass_density, :DST01),
+                (:center_dust2_column_mass_density, :DST02),
+                (:center_dust3_column_mass_density, :DST03),
+                (:center_dust4_column_mass_density, :DST04),
+                (:center_dust5_column_mass_density, :DST05),
+                (:center_ss1_column_mass_density, :SSLT01),
+                (:center_ss2_column_mass_density, :SSLT02),
+                (:center_ss3_column_mass_density, :SSLT03),
+                (:center_ss4_column_mass_density, :SSLT04),
+                (:center_ss5_column_mass_density, :SSLT05),
+            )
 
             aerosol_names_pair = [
                 more_aerosols...,

src/compat.jl

@@ -97,46 +97,3 @@ else
     report_walltime = ClimaUtilities.OnlineLogging.report_walltime
 end
 
-
-if pkgversion(RRTMGP) <= v"0.19.2"
-    function _update_some_aerosol_conc(Y, p)
-        ᶜΔz = Fields.Δz_field(Y.c)
-        rrtmgp_model = p.radiation.rrtmgp_model
-        ᶜaero_conc = Fields.array2field(
-            rrtmgp_model.center_dust_column_mass_density,
-            axes(Y.c),
-        )
-        @. ᶜaero_conc = 0
-        for prescribed_aerosol_name in [:DST01, :DST02, :DST03, :DST04]
-            if prescribed_aerosol_name in
-               propertynames(p.tracers.prescribed_aerosols_field)
-                aerosol_field = getproperty(
-                    p.tracers.prescribed_aerosols_field,
-                    prescribed_aerosol_name,
-                )
-                @. ᶜaero_conc += aerosol_field * Y.c.ρ * ᶜΔz
-            end
-        end
-
-        ᶜaero_conc = Fields.array2field(
-            rrtmgp_model.center_ss_column_mass_density,
-            axes(Y.c),
-        )
-        @. ᶜaero_conc = 0
-        for prescribed_aerosol_name in [:SSLT01, :SSLT02, :SSLT03, :SSLT04]
-            if prescribed_aerosol_name in
-               propertynames(p.tracers.prescribed_aerosols_field)
-                aerosol_field = getproperty(
-                    p.tracers.prescribed_aerosols_field,
-                    prescribed_aerosol_name,
-                )
-                @. ᶜaero_conc += aerosol_field * Y.c.ρ * ᶜΔz
-            end
-        end
-        return nothing
-    end
-else
-    function _update_some_aerosol_conc(_, _)
-        return nothing
-    end
-end

src/parameterized_tendencies/radiation/RRTMGPInterface.jl

@@ -813,46 +813,32 @@ function _RRTMGPModel(
             aero_size = DA{FT}(undef, n_aerosol_sizes, nlay, ncol)
             aero_mass = DA{FT}(undef, n_aerosols, nlay, ncol)
 
-            if pkgversion(RRTMGP) <= v"0.19.2"
-                aerosol_size_names = ["dust", "ss"]
-                aerosol_names =
-                    ["dust", "ss", "so4", "bcpi", "bcpo", "ocpi", "ocpo"]
-                for (i, name) in enumerate(aerosol_size_names)
+            aerosol_names = [
+                "dust1",
+                "ss1",
+                "so4",
+                "bcpi",
+                "bcpo",
+                "ocpi",
+                "ocpo",
+                "dust2",
+                "dust3",
+                "dust4",
+                "dust5",
+                "ss2",
+                "ss3",
+                "ss4",
+                "ss5",
+            ]
+            for (i, name) in enumerate(aerosol_names)
+                if occursin("dust", name) || occursin("ss", name)
                     set_and_save!(
                         view(aero_size, i, :, :),
                         "center_$(name)_radius",
                         t...,
                         dict,
                     )
                 end
-            else
-                aerosol_names = [
-                    "dust1",
-                    "ss1",
-                    "so4",
-                    "bcpi",
-                    "bcpo",
-                    "ocpi",
-                    "ocpo",
-                    "dust2",
-                    "dust3",
-                    "dust4",
-                    "dust5",
-                    "ss2",
-                    "ss3",
-                    "ss4",
-                    "ss5",
-                ]
-                for (i, name) in enumerate(aerosol_names)
-                    if occursin("dust", name) || occursin("ss", name)
-                        set_and_save!(
-                            view(aero_size, i, :, :),
-                            "center_$(name)_radius",
-                            t...,
-                            dict,
-                        )
-                    end
-                end
             end
             for (i, name) in enumerate(aerosol_names)
                 set_and_save!(