Add initialization flags.

Author: dustinswales

physics/Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90

@@ -48,7 +48,7 @@ module rrtmgp_lw_cloud_optics
   ! ######################################################################################
 !>
   subroutine rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,         &
-       nrghice, mpicomm, mpirank, mpiroot, errmsg, errflg)
+       nrghice, mpicomm, mpirank, mpiroot, is_initialized, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -64,9 +64,11 @@ subroutine rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,
          mpiroot               !< Master MPI rank
 
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_initialized        !< Initialization flag
+    character(len=*), intent(  out) :: &
          errmsg                !< Error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg                !< Error code
 
     ! Local variables
@@ -77,6 +79,8 @@ subroutine rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,
     errmsg = ''
     errflg = 0
 
+    if (is_initialized) return
+
     ! Filenames are set in the physics_nml
     lw_cloud_props_file = trim(rrtmgp_root_dir)//trim(rrtmgp_lw_file_clouds)
 
@@ -240,6 +244,8 @@ subroutine rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,
             lut_exticeLW, lut_ssaiceLW, lut_asyiceLW))
 
     call check_error_msg('lw_cloud_optics_init',lw_cloud_props%set_ice_roughness(nrghice))
- 
+
+    is_initialized = .true.
+
   end subroutine rrtmgp_lw_cloud_optics_init
 end module rrtmgp_lw_cloud_optics

physics/Radiation/RRTMGP/rrtmgp_lw_gas_optics.F90

@@ -72,7 +72,7 @@ module rrtmgp_lw_gas_optics
 
 !>
   subroutine rrtmgp_lw_gas_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_gas,                 &
-       active_gases_array, mpicomm, mpirank, mpiroot, errmsg, errflg)
+       active_gases_array, mpicomm, mpirank, mpiroot, is_initialized, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -87,9 +87,11 @@ subroutine rrtmgp_lw_gas_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_gas,
          mpiroot             !< Master MPI rank
 
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_initialized      !< Initialization flag.
+    character(len=*), intent(  out) :: &
          errmsg              !< CCPP error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg              !< CCPP error code
 
     ! Local variables
@@ -102,6 +104,8 @@ subroutine rrtmgp_lw_gas_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_gas,
     errmsg = ''
     errflg = 0
 
+    if (is_initialized) return
+
     ! Filenames are set in the physics_nml
     lw_gas_props_file  = trim(rrtmgp_root_dir)//trim(rrtmgp_lw_file_gas)
 
@@ -459,7 +463,9 @@ subroutine rrtmgp_lw_gas_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_gas,
          scaling_gas_lowerLW, scaling_gas_upperLW, scale_by_complement_lowerLW,             &
          scale_by_complement_upperLW, kminor_start_lowerLW, kminor_start_upperLW, totplnkLW,&
          planck_fracLW, rayl_lowerLW, rayl_upperLW, optimal_angle_fitLW))
-    
+
+    is_initialized = .true.
+
   end subroutine rrtmgp_lw_gas_optics_init
 
 end module rrtmgp_lw_gas_optics

physics/Radiation/RRTMGP/rrtmgp_lw_main.F90

@@ -31,7 +31,7 @@ module rrtmgp_lw_main
 !!
   subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_file_clouds,&
        active_gases_array, nrghice, mpicomm, mpirank, mpiroot, nLay, rrtmgp_phys_blksz,     &
-       errmsg, errflg)
+       is_init_gas_optics, is_init_cloud_optics, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -53,9 +53,12 @@ subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_fi
          nLay
 
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_init_gas_optics,    & !< Initialization flag
+         is_init_cloud_optics     !< Initialization flag
+    character(len=*), intent(  out) :: &
          errmsg                   !< CCPP error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg                   !< CCPP error code
 
     ! Initialize CCPP error handling variables 
@@ -64,11 +67,11 @@ subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_fi
 
     ! RRTMGP longwave gas-optics (k-distribution) initialization
     call rrtmgp_lw_gas_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_gas,                  &
-         active_gases_array, mpicomm, mpirank, mpiroot, errmsg, errflg)
+         active_gases_array, mpicomm, mpirank, mpiroot, is_init_gas_optics, errmsg, errflg)
 
     ! RRTMGP longwave cloud-optics initialization
     call rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,             &
-         nrghice, mpicomm, mpirank, mpiroot, errmsg, errflg)
+         nrghice, mpicomm, mpirank, mpiroot, is_init_cloud_optics, errmsg, errflg)
 
   end subroutine rrtmgp_lw_main_init
 

physics/Radiation/RRTMGP/rrtmgp_lw_main.meta

@@ -88,6 +88,20 @@
   type = character
   kind = len=*
   intent = in
+[is_init_gas_optics]
+  standard_name = flag_for_rrmtgp_lw_gas_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = inout
+[is_init_cloud_optics]
+  standard_name = flag_for_rrmtgp_lw_cloud_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = inout
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

physics/Radiation/RRTMGP/rrtmgp_sw_cloud_optics.F90

@@ -45,7 +45,7 @@ module rrtmgp_sw_cloud_optics
   ! ######################################################################################
 !>
   subroutine rrtmgp_sw_cloud_optics_init( rrtmgp_root_dir, rrtmgp_sw_file_clouds,        &
-       nrghice, mpicomm, mpirank, mpiroot, errmsg, errflg)
+       nrghice, mpicomm, mpirank, mpiroot, is_initialized, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -60,9 +60,11 @@ subroutine rrtmgp_sw_cloud_optics_init( rrtmgp_root_dir, rrtmgp_sw_file_clouds,
          mpiroot               !< Master MPI rank
 
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_initialized        !< Initialization flag
+    character(len=*), intent(  out) :: &
          errmsg                !< CCPP error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg                !< CCPP error code
 
     ! Local variables
@@ -73,6 +75,8 @@ subroutine rrtmgp_sw_cloud_optics_init( rrtmgp_root_dir, rrtmgp_sw_file_clouds,
     errmsg = ''
     errflg = 0
 
+    if (is_initialized) return
+
     ! Filenames are set in the physics_nml
     sw_cloud_props_file = trim(rrtmgp_root_dir)//trim(rrtmgp_sw_file_clouds)
 
@@ -251,5 +255,7 @@ subroutine rrtmgp_sw_cloud_optics_init( rrtmgp_root_dir, rrtmgp_sw_file_clouds,
     c0s = (/0.970, 0.970,   0.970,   0.970, 0.970, 0.970, 0.970,    &
             0.970, 0.970,   0.970,   0.700, 0.700, 0.700, 0.700/)
 
+    is_initialized = .true.
+
   end subroutine rrtmgp_sw_cloud_optics_init
 end module rrtmgp_sw_cloud_optics

physics/Radiation/RRTMGP/rrtmgp_sw_gas_optics.F90

@@ -83,7 +83,7 @@ module rrtmgp_sw_gas_optics
 !! the full k-distribution data is read in, reduced by the "active gases" provided, and
 !! loaded into the RRTMGP DDT, ty_gas_optics_rrtmgp.
   subroutine rrtmgp_sw_gas_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_gas,              &
-       active_gases_array, mpicomm, mpirank, mpiroot, errmsg, errflg)
+       active_gases_array, mpicomm, mpirank, mpiroot, is_initialized, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -98,9 +98,11 @@ subroutine rrtmgp_sw_gas_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_gas,
          mpiroot             !< Master MPI rank
 
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_initialized      !< Initialization flag.
+    character(len=*), intent(  out) :: &
          errmsg              !< CCPP error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg              !< CCPP error code
 
     ! Local variables
@@ -113,6 +115,8 @@ subroutine rrtmgp_sw_gas_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_gas,
     errmsg = ''
     errflg = 0
 
+    if (is_initialized) return
+
     ! Filenames are set in the gfphysics_nml
     sw_gas_props_file   = trim(rrtmgp_root_dir)//trim(rrtmgp_sw_file_gas)
 
@@ -509,6 +513,8 @@ subroutine rrtmgp_sw_gas_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_gas,
          solar_quietSW, solar_facularSW, solar_sunspotSW, tsi_defaultSW, mg_defaultSW,      &
          sb_defaultSW, rayl_lowerSW, rayl_upperSW))
 
+    is_initialized = .true.
+
   end subroutine rrtmgp_sw_gas_optics_init
 end module rrtmgp_sw_gas_optics
 

physics/Radiation/RRTMGP/rrtmgp_sw_main.F90

@@ -31,7 +31,7 @@ module rrtmgp_sw_main
 !!
   subroutine rrtmgp_sw_main_init(rrtmgp_root_dir, rrtmgp_sw_file_gas, rrtmgp_sw_file_clouds,&
        active_gases_array, nrghice, mpicomm, mpirank, mpiroot, nLay, rrtmgp_phys_blksz,     &
-       errmsg, errflg)
+       is_init_gas_optics, is_init_cloud_optics, errmsg, errflg)
 
     ! Inputs
     character(len=128),intent(in) :: &
@@ -50,9 +50,12 @@ subroutine rrtmgp_sw_main_init(rrtmgp_root_dir, rrtmgp_sw_file_gas, rrtmgp_sw_fi
          rrtmgp_phys_blksz,     & !< Number of horizontal points to process at once.
          nLay
     ! Outputs
-    character(len=*), intent(out) :: &
+    logical,          intent(inout) :: &
+         is_init_gas_optics,    & !< Initialization flag
+         is_init_cloud_optics     !< Initialization flag
+    character(len=*), intent(  out) :: &
          errmsg                   !< CCPP error message
-    integer,          intent(out) :: &
+    integer,          intent(  out) :: &
          errflg                   !< CCPP error code
 
     ! Initialize CCPP error handling variables
@@ -61,11 +64,11 @@ subroutine rrtmgp_sw_main_init(rrtmgp_root_dir, rrtmgp_sw_file_gas, rrtmgp_sw_fi
 
     ! RRTMGP shortwave gas-optics (k-distribution) initialization
     call rrtmgp_sw_gas_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_gas, active_gases_array,&
-         mpicomm, mpirank, mpiroot, errmsg, errflg)
+         mpicomm, mpirank, mpiroot, is_init_gas_optics, errmsg, errflg)
 
     ! RRTMGP shortwave cloud-optics initialization
     call rrtmgp_sw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_sw_file_clouds,               &
-         nrghice, mpicomm, mpirank, mpiroot, errmsg, errflg)
+         nrghice, mpicomm, mpirank, mpiroot, is_init_cloud_optics, errmsg, errflg)
 
   end subroutine rrtmgp_sw_main_init
 

physics/Radiation/RRTMGP/rrtmgp_sw_main.meta

@@ -87,6 +87,20 @@
   type = character
   kind = len=*
   intent = in
+[is_init_gas_optics]
+  standard_name = flag_for_rrmtgp_sw_gas_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = inout
+[is_init_cloud_optics]
+  standard_name = flag_for_rrmtgp_sw_cloud_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = inout
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP