ESCOMP · peverwhee · Jun 6, 2025 · Jun 6, 2025 · Jun 6, 2025 · Jun 9, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "ccpp-framework"]
         path          = ccpp_framework
         url           = https://github.com/NCAR/ccpp-framework
-        fxtag         = 2025-10-01-dev
+        fxtag         = 2025-10-15-dev
         fxrequired    = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework
 [submodule "history"]
@@ -19,8 +19,8 @@
         fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
-	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = 73fce2706c1f70e1ba63ff4bb3dcb80323bb9cc6
+	url           = https://github.com/peverwhee/atmospheric_physics
+	fxtag         = b0a79e8a6adb0ab5458955c8d9eed578ccb7f10f
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "rrtmgp-data"]

diff --git a/ccpp_framework b/ccpp_framework
diff --git a/cime_config/namelist_definition_cam.xml b/cime_config/namelist_definition_cam.xml
@@ -377,6 +377,68 @@
     </values>
   </entry>
 
+<!-- Radiation -->
+
+  <entry id="iradsw">
+    <type>integer</type>
+    <category>radiation</category>
+    <group>radiation_nl</group>
+    <desc>
+       The frequency at which shortwave calculation is performed.
+       positive: time steps; negative: hours
+    </desc>
+    <values>
+      <value>-1</value>
+    </values>
+  </entry>
+  <entry id="iradlw">
+    <type>integer</type>
+    <category>radiation</category>
+    <group>radiation_nl</group>
+    <desc>
+       The frequency at which longwave calculation is performed.
+       positive: time steps; negative: hours
+    </desc>
+    <values>
+      <value>-1</value>
+    </values>
+  </entry>
+  <entry id="irad_always">
+    <type>integer</type>
+    <category>radiation</category>
+    <group>radiation_nl</group>
+    <desc>
+       The amount of time that radiation (both SW and LW) is run continuously from the start of an initial or restart run
+       positive: time steps; negative: hours
+    </desc>
+    <values>
+      <value>-1</value>
+    </values>
+  </entry>
+  <entry id="use_rad_uniform_angle">
+    <type>logical</type>
+    <category>radiation</category>
+    <group>radiation_nl</group>
+    <desc>
+       If true, use the namelist-defined radiation uniform angle in the solar zenith angle calculation
+    </desc>
+    <values>
+      <value>.false.</value>
+    </values>
+  </entry>
+  <entry id="rad_uniform_angle">
+    <type>real</type>
+    <kind>kind_phys</kind>
+    <category>radiation</category>
+    <group>radiation_nl</group>
+    <desc>
+       The radiation timestep size for the solar zenith angle calculation
+    </desc>
+    <values>
+      <value>-99</value>
+    </values>
+  </entry>
+
 <!-- Vertical Coordinate -->
 
   <entry id="pver">

diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
@@ -88,6 +88,15 @@
       <option name="comment">Test for Holtslag-Boville boundary layer scheme and vertical diffusion</option>
     </options>
   </test>
+  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_rrtmgp_derecho">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_sima"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment">Snapshot test for RRTMGP</option>
+    </options>
+  </test>
 
   <!-- Derecho dycore tests -->
   <test compset="FKESSLER" grid="mpasa480_mpasa480" name="SMS_Ln9" testmods="cam/outfrq_kessler_mpas_derecho">

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/shell_commands
@@ -0,0 +1,2 @@
+ ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites rrtmgp"
+./xmlchange RUN_STARTDATE=1979-01-01
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/user_nl_cam
@@ -0,0 +1,25 @@
+! these are FHISTC_LTso snapshots
+ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc_ltso_rrtmgp_derecho_gnu_before_c20251013.nc'
+ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc_ltso_rrtmgp_derecho_gnu_after_c20251013.nc'
+
+! tolerances for testing
+ncdata_check_err = .true.
+min_difference = 1e-15
+
+! vertical levels in snapshot
+pver = 58
+
+! Do radiation on every timestep we're testing
+irad_always=3
+
+! diagnostic output
+hist_output_frequency;h1: 1*nsteps
+hist_precision;h1: REAL64
+hist_add_inst_fields;h1: HR
+! Cloud output
+hist_add_inst_fields;h1: TOT_CLD_VISTAU,TOT_ICLD_VISTAU,ICE_ICLD_VISTAU,LIQ_ICLD_VISTAU
+! Longwave diagnostic output
+hist_add_inst_fields;h1: QRL,QRLC,FLNT,FLNTC,FLUT,FLUTC,LWCF,FLN200,FLN200C,FLNR,FLNS,FLNSC,FLDS,FLDSC,FUL,FDL,FULC,FDLC
+! Shortwave diagnostic fields
+hist_add_inst_fields;h1: SOLIN,QRS,QRSC,FSNT,FSNTC,FSNTOA,FSNTOAC,SWCF,FSUTOA,FSN200,FSN200C,FSNR,SOLL,SOLS,SOLLD,SOLSD
+hist_add_inst_fields;h1: FSNS,FSNSC,FSDS,FSDSC,FUS,FDS,FUSC,FDSC
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/user_nl_cpl b/cime_config/testdefs/testmods_dirs/cam/outfrq_rrtmgp_derecho/user_nl_cpl
@@ -0,0 +1,5 @@
+! Set fixed orbital parameters
+orb_mode='fixed_parameters'
+orb_eccen = 0.
+orb_obliq = 0.
+orb_mvelp = 0.
diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90
@@ -27,8 +27,9 @@ module cam_comp
 
    use physics_types,             only: phys_state, phys_tend
    use physics_types,             only: dtime_phys
-   use physics_types,             only: calday
+   use physics_types,             only: calday, next_calday, radiation_offset, nextsw_cday
    use physics_types,             only: is_first_timestep, nstep
+   use physics_types,             only: is_first_restart_timestep
    use dyn_comp,                  only: dyn_import_t, dyn_export_t
 
    use perf_mod,                  only: t_barrierf, t_startf, t_stopf
@@ -177,12 +178,22 @@ subroutine cam_init(caseid, ctitle, model_doi_url,                         &
       is_first_timestep = .true.
       call mark_as_initialized('is_first_timestep')
 
+      is_first_restart_timestep = .false.
+      call mark_as_initialized('is_first_restart_timestep')
+
       nstep = get_nstep()
       call mark_as_initialized('current_timestep_number')
 
       ! Get current fractional calendar day. Needs to be updated at every timestep.
       calday = get_curr_calday()
+      next_calday = get_curr_calday(offset=int(get_step_size()))
+      radiation_offset = 0
+      nextsw_cday = next_calday
       call mark_as_initialized('fractional_calendar_days_on_end_of_current_timestep')
+      call mark_as_initialized('fractional_calendar_days_on_end_of_next_timestep')
+      call mark_as_initialized('number_of_seconds_until_next_shortwave_radiation_timestep')
+      call mark_as_initialized('next_calendar_day_to_perform_shortwave_radiation_for_surface_models')
+      call mark_as_initialized('number_of_wavelength_samples_of_spectrum')
 
       ! Read CAM namelists.
       filein = "atm_in" // trim(inst_suffix)
@@ -284,11 +295,13 @@ subroutine cam_timestep_init()
       use physics_grid,              only: lat_rad, lon_rad
       use orbital_data,              only: orbital_data_advance
       use stepon,                    only: stepon_timestep_init
+      use physics_types,             only: dt_avg
       use cam_ccpp_cap,              only: cam_constituents_array
       use cam_ccpp_cap,              only: cam_model_const_properties
       use ccpp_constituent_prop_mod, only: ccpp_constituent_prop_ptr_t
       use ccpp_kinds,                only: kind_phys
       use musica_ccpp_dependencies,  only: set_initial_musica_concentrations
+      use radiation_namelist,        only: use_rad_uniform_angle, rad_uniform_angle
 
       real(kind_phys), pointer :: constituents_array(:,:,:)
       type(ccpp_constituent_prop_ptr_t), pointer :: constituent_properties(:)
@@ -297,7 +310,8 @@ subroutine cam_timestep_init()
       calday = get_curr_calday()
 
       ! Update the orbital data
-      call orbital_data_advance(calday, lat_rad, lon_rad)
+      call orbital_data_advance(calday, lat_rad, lon_rad, use_rad_uniform_angle, &
+                                rad_uniform_angle, dt_avg)
 
       ! Update timestep flags in physics state
       is_first_timestep = is_first_step()
@@ -336,6 +350,10 @@ subroutine cam_timestep_init()
       !
       call phys_timestep_init()
 
+      ! Call share code to get relevant calendar days
+      nextsw_cday = get_curr_calday(offset=radiation_offset)
+      next_calday = get_curr_calday(offset=int(get_step_size()))
+
    end subroutine cam_timestep_init
    !
    !-----------------------------------------------------------------------

diff --git a/src/control/cam_control_mod.F90 b/src/control/cam_control_mod.F90
@@ -101,6 +101,7 @@ end subroutine cam_ctrl_init
    !---------------------------------------------------------------------------
 
    subroutine cam_ctrl_set_orbit(eccen_in, obliqr_in, lambm0_in, mvelpp_in)
+      use phys_vars_init_check, only: mark_as_initialized
 
       real(r8), intent(in) :: eccen_in
       real(r8), intent(in) :: obliqr_in
@@ -112,6 +113,8 @@ subroutine cam_ctrl_set_orbit(eccen_in, obliqr_in, lambm0_in, mvelpp_in)
       lambm0 = lambm0_in
       mvelpp = mvelpp_in
 
+      call mark_as_initialized('planet_orbital_eccentricity_factor')
+
    end subroutine cam_ctrl_set_orbit
 
 end module cam_control_mod
diff --git a/src/control/runtime_obj.F90 b/src/control/runtime_obj.F90
@@ -2,12 +2,17 @@ module runtime_obj
 
    use shr_kind_mod, only: CS => SHR_KIND_CS
    use shr_kind_mod, only: r8=>shr_kind_r8
+   use ccpp_kinds,   only: kind_phys
    implicit none
    private
 
+   !> \section arg_table_runtime_obj  Argument Table
+   !! \htmlinclude arg_table_runtime_obj.html
+   !!
+   real(kind_phys),  public, parameter :: unset_real   = huge(1.0_r8)
+
    character(len=*), public, parameter :: unset_str    = 'UNSET'
    integer,          public, parameter :: unset_int    = huge(1)
-   real(r8),         public, parameter :: unset_real   = huge(1.0_r8)
 
    ! Water vapor constituent standard name
    character(len=*), public, parameter :: wv_stdname = 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water'
@@ -19,6 +24,7 @@ module runtime_obj
    !!
    type, public :: runtime_options
       character(len=CS), private            :: phys_suite = unset_str
+      character(len=CS), private            :: dycore     = unset_str
       character(len=16), private            :: waccmx_opt = unset_str
       ! use_gw_front: Frontogenesis
       logical,           private :: use_gw_front = .false.
@@ -29,6 +35,7 @@ module runtime_obj
    contains
       ! General runtime access
       procedure, public :: physics_suite
+      procedure, public :: get_dycore
       procedure, public :: suite_as_list
       ! Runtime parameters of interest to dycore
       procedure, public :: waccmx_on
@@ -41,6 +48,7 @@ module runtime_obj
    type(runtime_options), public, protected :: cam_runtime_opts
 
    public :: cam_set_runtime_opts
+   public :: set_cam_dycore
 
    ! Private data
    logical :: runtime_configured = .false.
@@ -53,6 +61,12 @@ pure character(len=CS) function physics_suite(self)
       physics_suite = trim(self%phys_suite)
    end function physics_suite
 
+   pure character(len=CS) function get_dycore(self)
+      class(runtime_options), intent(in) :: self
+
+      get_dycore = trim(self%dycore)
+   end function get_dycore
+
    pure function suite_as_list(self) result(slist)
       class(runtime_options), intent(in) :: self
       character(len=CS) :: slist(1)
@@ -95,6 +109,13 @@ pure logical function update_thermodynamic_variables(self)
 
    end function update_thermodynamic_variables
 
+   subroutine set_cam_dycore(dycore_in)
+      character(len=*),          intent(in) :: dycore_in
+
+      cam_runtime_opts%dycore = trim(dycore_in)
+
+   end subroutine set_cam_dycore
+
    subroutine cam_set_runtime_opts(phys_suite, waccmx_opt,                    &
         gw_front, gw_front_igw)
       use cam_abortutils, only: endrun

diff --git a/src/control/runtime_obj.meta b/src/control/runtime_obj.meta
@@ -1,3 +1,15 @@
+[ccpp-table-properties]
+  name = runtime_obj
+  type = module
+[ccpp-arg-table]
+  name = runtime_obj
+  type = module
+[ unset_real ]
+  standard_name = definition_of_unset_for_real_variables
+  units = 1
+  type = real | kind = kind_phys
+  protected = True
+  dimensions = ()
 [ccpp-table-properties]
   name = runtime_options
   type = ddt

diff --git a/src/control/runtime_opts.F90 b/src/control/runtime_opts.F90
@@ -45,6 +45,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
       use inic_analytic_utils, only: analytic_ic_readnl
 
       use tropopause_climo_read, only: tropopause_climo_readnl
+      use radiation_namelist,    only: radiation_readnl
 
 !      use tracers,             only: tracers_readnl
 !      use nudging,             only: nudging_readnl
@@ -102,6 +103,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
 !      call check_energy_readnl(nlfilename)
       call analytic_ic_readnl(nlfilename)
       call tropopause_climo_readnl(nlfilename)
+      call radiation_readnl(nlfilename)
 !      call scam_readnl(nlfilename, single_column, scmlat, scmlon)
 !      call nudging_readnl(nlfilename)
 

diff --git a/src/data/generate_registry_data.py b/src/data/generate_registry_data.py
@@ -1064,11 +1064,11 @@ def write_definition(self, outfile, access, indent):
         # end for
 
 
-    def check_initial_values(self, physconst_vars):
+    def check_initial_values(self, physconst_vars,use_statements):
         """Raise an error if there are any initial values that are set to
         non-"used" and/or non-"physconst" variables"""
         for var in self.known_initial_value_vars:
-            if var not in physconst_vars:
+            if var not in physconst_vars and not any(second == var for _, second in use_statements):
                 emsg = f"Initial value '{var}' is not a physconst variable"
                 emsg += " or does not have necessary use statement"
                 raise CCPPError(emsg)
@@ -1704,7 +1704,7 @@ def write_registry_files(registry, dycore, outdir, src_mod, src_root,
         # end for
         # Then check against the initial values in the variable dictionary
         # Check will raise an exception if there is a rogue variable
-        file_.var_dict.check_initial_values(physconst_vars)
+        file_.var_dict.check_initial_values(physconst_vars,file_.use_statements)
         # Generate metadata and source
         if file_.generate_code:
             file_.write_metadata(outdir, logger)
+75 −2		scripts/fortran_tools/parse_fortran.py
+147 −123		scripts/fortran_tools/parse_fortran_file.py
+12 −18		scripts/metavar.py
+4 −0		test/capgen_test/CMakeLists.txt
+1 −0		test/capgen_test/README.md
+1 −0		test/capgen_test/capgen_test_reports.py
+12 −0		test/capgen_test/ddt2.F90
+11 −0		test/capgen_test/make_ddt.F90
+1 −0		test/capgen_test/make_ddt.meta
+3 −3		test/test_stub.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites rrtmgp"
		./xmlchange RUN_STARTDATE=1979-01-01