Merge pull request #3691 from CliMA/ck/rrtmgp_interface_refactor

Remove data_loader in RRTMGPInterface

Author: charleskawczynski

src/ClimaAtmos.jl

@@ -28,9 +28,6 @@ import .AtmosArtifacts as AA
 include(joinpath("topography", "topography.jl"))
 include(joinpath("topography", "steady_state_solutions.jl"))
 
-include(
-    joinpath("parameterized_tendencies", "radiation", "radiation_utilities.jl"),
-)
 include(joinpath("parameterized_tendencies", "radiation", "RRTMGPInterface.jl"))
 import .RRTMGPInterface as RRTMGPI
 include(joinpath("parameterized_tendencies", "radiation", "radiation.jl"))

src/parameterized_tendencies/radiation/RRTMGPInterface.jl

@@ -2,6 +2,7 @@ module RRTMGPInterface
 
 import ..AbstractCloudInRadiation
 
+import NCDatasets as NC
 using RRTMGP
 import RRTMGP.AtmosphericStates as AS
 using ClimaCore: DataLayouts, Spaces, Fields
@@ -318,8 +319,7 @@ top/bottom of the atmosphere can be specified as a scalar, or as the full 1D
 array.
 
 # Positional Arguments
-- `data_loader(callback::Function, file_name)`: a function for
-   loading RRTMGP.jl artifacts, stored in `RRTMGPReferenceData/<file_name>`.
+- Artifacts stored in `RRTMGPReferenceData/<file_name>`.
    Should be callable with filenames:
   - `lookup_tables/clearsky_lw.nc`
   - `lookup_tables/cloudysky_lw.nc`
@@ -410,7 +410,6 @@ array.
 """
 function RRTMGPModel(
     params::RRTMGP.Parameters.ARP,
-    data_loader::Function,
     context;
     ncol::Int,
     domain_nlay::Int,
@@ -486,7 +485,7 @@ function RRTMGPModel(
         nbnd_lw = 1
     else
         local lookup_lw, idx_gases
-        data_loader(RRTMGP.ArtifactPaths.get_lookup_filename(:gas, :lw)) do ds
+        NC.Dataset(RRTMGP.ArtifactPaths.get_lookup_filename(:gas, :lw)) do ds
             lookup_lw, idx_gases = RRTMGP.LookUpTables.LookUpLW(ds, FT, DA)
         end
         lookups = (; lookups..., lookup_lw, idx_gases)
@@ -496,7 +495,7 @@ function RRTMGPModel(
 
         if !(radiation_mode isa ClearSkyRadiation)
             local lookup_lw_cld
-            data_loader(
+            NC.Dataset(
                 RRTMGP.ArtifactPaths.get_lookup_filename(:cloud, :lw),
             ) do ds
                 lookup_lw_cld = RRTMGP.LookUpTables.LookUpCld(ds, FT, DA)
@@ -505,7 +504,7 @@ function RRTMGPModel(
         end
         if radiation_mode.aerosol_radiation
             local lookup_lw_aero, idx_aerosol, idx_aerosize
-            data_loader(
+            NC.Dataset(
                 RRTMGP.ArtifactPaths.get_lookup_filename(:aerosol, :lw),
             ) do ds
                 lookup_lw_aero, idx_aerosol, idx_aerosize =
@@ -554,7 +553,7 @@ function RRTMGPModel(
         nbnd_sw = 1
     else
         local lookup_sw, idx_gases
-        data_loader(RRTMGP.ArtifactPaths.get_lookup_filename(:gas, :sw)) do ds
+        NC.Dataset(RRTMGP.ArtifactPaths.get_lookup_filename(:gas, :sw)) do ds
             lookup_sw, idx_gases = RRTMGP.LookUpTables.LookUpSW(ds, FT, DA)
         end
         lookups = (; lookups..., lookup_sw, idx_gases)
@@ -564,7 +563,7 @@ function RRTMGPModel(
 
         if !(radiation_mode isa ClearSkyRadiation)
             local lookup_sw_cld
-            data_loader(
+            NC.Dataset(
                 RRTMGP.ArtifactPaths.get_lookup_filename(:cloud, :sw),
             ) do ds
                 lookup_sw_cld = RRTMGP.LookUpTables.LookUpCld(ds, FT, DA)
@@ -574,7 +573,7 @@ function RRTMGPModel(
 
         if radiation_mode.aerosol_radiation
             local lookup_sw_aero, idx_aerosol, idx_aerosize
-            data_loader(
+            NC.Dataset(
                 RRTMGP.ArtifactPaths.get_lookup_filename(:aerosol, :sw),
             ) do ds
                 lookup_sw_aero, idx_aerosol, idx_aerosize =

src/parameterized_tendencies/radiation/radiation.jl

@@ -6,6 +6,7 @@ import ClimaComms
 import ClimaCore: DataLayouts, Geometry, Spaces, Fields, Operators
 import Insolation
 import Thermodynamics as TD
+import NCDatasets as NC
 import .Parameters as CAP
 import RRTMGP
 import .RRTMGPInterface as RRTMGPI
@@ -108,7 +109,6 @@ function radiation_model_cache(
     insolation_mode;
     interpolation = RRTMGPI.BestFit(),
     bottom_extrapolation = RRTMGPI.SameAsInterpolation(),
-    data_loader = rrtmgp_data_loader,
 )
     context = ClimaComms.context(axes(Y.c))
     device = context.device
@@ -150,9 +150,7 @@ function radiation_model_cache(
         latitude = Fields.field2array(zero(bottom_coords.z)) # flat space is on Equator
     end
     local rrtmgp_model
-    data_loader(
-        RRTMGP.ArtifactPaths.get_input_filename(:gas, :lw),
-    ) do input_data
+    NC.Dataset(RRTMGP.ArtifactPaths.get_input_filename(:gas, :lw)) do input_data
         if radiation_mode isa RRTMGPI.GrayRadiation
             kwargs = (;
                 lapse_rate = 3.5,
@@ -308,7 +306,6 @@ function radiation_model_cache(
 
         rrtmgp_model = RRTMGPI.RRTMGPModel(
             rrtmgp_params,
-            data_loader,
             context;
             ncol = length(Spaces.all_nodes(axes(Spaces.level(Y.c, 1)))),
             domain_nlay = Spaces.nlevels(axes(Y.c)),