update GFS_typedefs to be consistent with what was merged

dustinswales · Sep 28, 2020 · 2503eb7 · 2503eb7
1 parent cd7ec71
commit 2503eb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
@@ -7025,6 +7025,9 @@ subroutine interstitial_phys_reset (Interstitial, Model)
 
   end subroutine interstitial_phys_reset
 
+  ! DH* 20200901: this routine is no longer used by CCPP's GFS_debug.F90. When new variables are
+  ! added to the GFS_interstitial_type, it is best to add the variable to both interstitial_print
+  ! below and to GFS_interstitialtoscreen in ccpp/physics/physics/GFS_debug.F90
   subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
     !
     implicit none

diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
@@ -2505,19 +2505,19 @@
   dimensions = ()
   type = integer
 [iovr]
-  standard_name = flag_for_max_random_overlap_clouds_for_radiation
+  standard_name = flag_for_cloud_overlap_method_for_radiation
   long_name = max-random overlap clouds
   units = flag
   dimensions = ()
   type = integer
 [iovr_sw]
-  standard_name = flag_for_max_random_overlap_clouds_for_shortwave_radiation
+  standard_name = flag_for_cloud_overlap_method_for_shortwave_radiation
   long_name = sw: max-random overlap clouds
   units = flag
   dimensions = ()
   type = integer
 [iovr_lw]
-  standard_name = flag_for_max_random_overlap_clouds_for_longwave_radiation
+  standard_name = flag_for_cloud_overlap_method_for_longwave_radiation
   long_name = lw: max-random overlap clouds
   units = flag
   dimensions = ()