Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from …

…ccpp_types (ufs-community#508) * Split GFS_typedefs.F90: move GFS_interstitial_type to CCPP_typedefs.F90; Rename CCPP_interstitial to GFDL_interstitial; Import ccpp_t from ccpp_types instead of ccpp_api * Add bugfix in ccpp/data/GFS_typedefs.meta: mark input_nml_file as active only if the number of lines in the file is greater than zero
NOAA-PSL · Apr 12, 2022 · bffbeeb · bffbeeb
1 parent 6e6d9c7
commit bffbeeb
Show file tree

Hide file tree

Showing 12 changed files with 4,628 additions and 4,641 deletions.
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -47,15 +47,15 @@
         'module_radlw_parameters' : '',
         },
     'CCPP_typedefs' : {
-        'CCPP_interstitial_type' : 'CCPP_interstitial',
+        'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
+        'GFDL_interstitial_type' : 'GFDL_interstitial',
         'CCPP_typedefs' : '',
         },
     'CCPP_data' : {
         'CCPP_data' : '',
         },
     'GFS_typedefs' : {
         'GFS_control_type'      : 'GFS_Control',
-        'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
         'GFS_data_type'         : 'GFS_Data(cdata%blk_no)',
         'GFS_diag_type'         : 'GFS_Data(cdata%blk_no)%Intdiag',
         'GFS_tbd_type'          : 'GFS_Data(cdata%blk_no)%Tbd',

diff --git a/ccpp/data/CCPP_data.F90 b/ccpp/data/CCPP_data.F90
@@ -5,10 +5,10 @@ module CCPP_data
 !!
 
     use ccpp_types,    only: ccpp_t
-    use CCPP_typedefs, only: CCPP_interstitial_type
+    use CCPP_typedefs, only: GFS_interstitial_type,  &
+                             GFDL_interstitial_type
     use GFS_typedefs,  only: GFS_control_type,       &
-                             GFS_data_type,          &
-                             GFS_interstitial_type
+                             GFS_data_type
 
     implicit none
 
@@ -18,7 +18,7 @@ module CCPP_data
            cdata_domain,           &
            cdata_block,            &
            ccpp_suite,             &
-           CCPP_interstitial,      &
+           GFDL_interstitial,      &
            GFS_control,            &
            GFS_data,               &
            GFS_interstitial
@@ -34,7 +34,7 @@ module CCPP_data
     !------------------------------------------------------!
     !  CCPP data containers for dynamics (fast physics)    !
     !------------------------------------------------------!
-    type(CCPP_interstitial_type),                              save, target :: CCPP_interstitial
+    type(GFDL_interstitial_type),                              save, target :: GFDL_interstitial
 
     !------------------------------------------------------!
     !  CCPP containers for the six tiles used in dynamics, !

diff --git a/ccpp/data/CCPP_data.meta b/ccpp/data/CCPP_data.meta
@@ -12,12 +12,12 @@
   units = DDT
   dimensions = ()
   type = ccpp_t
-[CCPP_interstitial]
-  standard_name = CCPP_interstitial_type_instance
-  long_name = instance of derived type CCPP_interstitial_type
+[GFDL_interstitial]
+  standard_name = GFDL_interstitial_type_instance
+  long_name = instance of derived type GFDL_interstitial_type
   units = DDT
   dimensions = ()
-  type = CCPP_interstitial_type
+  type = GFDL_interstitial_type
 [GFS_Control]
   standard_name = GFS_control_type_instance
   long_name = instance of derived type GFS_control_type

diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90