More changes. Getting closer!

dustinswales · Sep 17, 2024 · 50c38bc · 50c38bc
1 parent 1d01c6c
commit 50c38bc
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 345 deletions.
diff --git a/ccpp/config/ccpp_capgen_config.py b/ccpp/config/ccpp_capgen_config.py
diff --git a/ccpp/config/scheme_files.txt b/ccpp/config/scheme_files.txt
@@ -1,9 +1,17 @@
-ccpp/physics/physics/photochem/module_ozphys.F90
-ccpp/physics/physics/Radiation/RRTMG/radlw_param.f
-ccpp/physics/physics/Radiation/RRTMG/radsw_param.f
+ccpp/physics/physics/hooks/machine.f
 ccpp/physics/physics/hooks/physcons.F90
 ccpp/physics/physics/tools/get_prs_fv3.F90
 ccpp/physics/physics/tools/get_phi_fv3.F90
+ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90
+ccpp/physics/physics/photochem/h2o_def.f
+ccpp/physics/physics/photochem/module_ozphys.F90
+ccpp/physics/physics/Radiation/RRTMG/radlw_param.f
+ccpp/physics/physics/Radiation/RRTMG/radsw_param.f
+scm/src/ccpp_config.F90
+scm/src/GFS_typedefs.F90
+scm/src/CCPP_typedefs.F90
+ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90
+ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90
 ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90
 ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90
 ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90

diff --git a/ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16.xml
@@ -11,6 +11,7 @@
   </group>
   <group name="radiation">
     <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
       <scheme>rad_sw_pre</scheme>
@@ -23,6 +24,7 @@
   </group>
   <group name="physics">
     <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
       <scheme>GFS_suite_stateout_reset</scheme>
       <scheme>get_prs_fv3</scheme>
       <scheme>GFS_suite_interstitial_1</scheme>

diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90
@@ -17,8 +17,6 @@ module CCPP_typedefs
 
     implicit none
 
-!    type(GFS_interstitial_type) :: GFS_interstitial_type
-
     ! To ensure that these values match what's in the physics, array
     ! sizes are compared in the auto-generated physics caps in debug mode
     ! from module_radiation_aerosols
@@ -452,6 +450,8 @@ module CCPP_typedefs
 
   end type GFS_interstitial_type
 
+  type(GFS_interstitial_type) :: GFS_interstitial_type_instance
+
 contains
 
 !----------------------

diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta
@@ -3013,4 +3013,10 @@
   long_name = index for volume mixing ratio cfc113
   units = count
   dimensions = ()
-  type = integer
+  type = integer
+[GFS_interstitial_type_instance]
+  standard_name = GFS_interstitial_type_instance
+  long_name = instance of type GFS_interstitial_type
+  units = DDT
+  dimensions = ()
+  type = GFS_interstitial_type
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
@@ -76,17 +76,6 @@ module GFS_typedefs
 !    GFS_cldprop_type        !< cloud fields needed by radiation from physics
 !    GFS_radtend_type        !< radiation tendencies needed in physics
 !    GFS_diag_type           !< fields targetted for diagnostic output
-!  type(GFS_init_type)     :: GFS_init_type
-!  type(GFS_statein_type)  :: GFS_statein_type
-!  type(GFS_stateout_type) :: GFS_stateout_type
-!  type(GFS_sfcprop_type)  :: GFS_sfcprop_type
-!  type(GFS_coupling_type) :: GFS_coupling_type
-!  type(GFS_control_type)  :: GFS_control_type
-!  type(GFS_grid_type)     :: GFS_grid_type
-!  type(GFS_tbd_type)      :: GFS_tbd_type
-!  type(GFS_cldprop_type)  :: GFS_cldprop_type
-!  type(GFS_radtend_type)  :: GFS_radtend_type
-!  type(GFS_diag_type)     :: GFS_diag_type
 
 !--------------------------------------------------------------------------------
 ! GFS_init_type
@@ -2208,12 +2197,24 @@ module GFS_typedefs
 ! PUBLIC ENTITIES
 !----------------
 
-  public GFS_init_type
-  public GFS_statein_type,  GFS_stateout_type, GFS_sfcprop_type, &
-         GFS_coupling_type
-  public GFS_control_type,  GFS_grid_type,     GFS_tbd_type, &
-         GFS_cldprop_type,  GFS_radtend_type,  GFS_diag_type
-
+  type(GFS_init_type)     :: GFS_init_type_instance
+  type(GFS_statein_type)  :: GFS_statein_type_instance
+  type(GFS_stateout_type) :: GFS_stateout_type_instance
+  type(GFS_sfcprop_type)  :: GFS_sfcprop_type_instance
+  type(GFS_coupling_type) :: GFS_coupling_type_instance
+  type(GFS_control_type)  :: GFS_control_type_instance
+  type(GFS_grid_type)     :: GFS_grid_type_instance
+  type(GFS_tbd_type)      :: GFS_tbd_type_instance
+  type(GFS_cldprop_type)  :: GFS_cldprop_type_instance
+  type(GFS_radtend_type)  :: GFS_radtend_type_instance
+  type(GFS_diag_type)     :: GFS_diag_type_instance
+
+  public GFS_init_type_instance
+  public GFS_statein_type_instance,  GFS_stateout_type_instance, GFS_sfcprop_type_instance, &
+         GFS_coupling_type_instance
+  public GFS_control_type_instance,  GFS_grid_type_instance,     GFS_tbd_type_instance, &
+         GFS_cldprop_type_instance,  GFS_radtend_type_instance,  GFS_diag_type_instance
+
 !*******************************************************************************************
   CONTAINS