Merge pull request NCAR#9 from NOAA-EMC/develop

Update EMC dev/emc from NCAR dtc/develop 2019/12/17 (NCAR#30)

ccpp/CMakeLists.txt

@@ -62,17 +62,22 @@ elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
   set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS_RELEASE}")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Bitforbit")
   if (${CMAKE_Fortran_COMPILER_ID} MATCHES "PGI")
-    set (CMAKE_C_FLAGS_RELEASE       "-O1 -fPIC" CACHE STRING "" FORCE)
-    set (CMAKE_CXX_FLAGS_RELEASE     "-O1 -fPIC" CACHE STRING "" FORCE)
-    set (CMAKE_Fortran_FLAGS_RELEASE "-O1 -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_C_FLAGS_BITFORBIT       "-O1 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_CXX_FLAGS_BITFORBIT     "-O1 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_Fortran_FLAGS_BITFORBIT "-O1 -g -fPIC" CACHE STRING "" FORCE)
+  elseif (APPLE AND ${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
+    set (CMAKE_C_FLAGS_BITFORBIT       "-O0 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_CXX_FLAGS_BITFORBIT     "-O0 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_Fortran_FLAGS_BITFORBIT "-O0 -g -fPIC" CACHE STRING "" FORCE)
+  # For Intel on all platforms and for GNU on all platforms except macOS
   else (${CMAKE_Fortran_COMPILER_ID} MATCHES "PGI")
-    set (CMAKE_C_FLAGS_RELEASE       "-O2 -fPIC" CACHE STRING "" FORCE)
-    set (CMAKE_CXX_FLAGS_RELEASE     "-O2 -fPIC" CACHE STRING "" FORCE)
-    set (CMAKE_Fortran_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_C_FLAGS_BITFORBIT       "-O2 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_CXX_FLAGS_BITFORBIT     "-O2 -g -fPIC" CACHE STRING "" FORCE)
+    set (CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -g -fPIC" CACHE STRING "" FORCE)
   endif (${CMAKE_Fortran_COMPILER_ID} MATCHES "PGI")
-  set (CMAKE_C_FLAGS        "${CMAKE_C_FLAGS_RELEASE}")
-  set (CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS_RELEASE}")
-  set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS_RELEASE}")
+  set (CMAKE_C_FLAGS        "${CMAKE_C_FLAGS_BITFORBIT}")
+  set (CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS_BITFORBIT}")
+  set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS_BITFORBIT}")
 endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
 # Set compiler-specific options, depending on build type; some optimization flags may only be used
@@ -84,12 +89,12 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
   set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fcray-pointer -ffree-line-length-none -fno-range-check")
   set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fbacktrace -cpp")
   if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    set (CMAKE_C_FLAGS        "${CMAKE_C_FLAGS} -Wall")
+    set (CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS} -Wall")
     set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans")
-    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -ffpe-trap=invalid,zero,overflow -fcheck=bounds -fbacktrace -fno-range-check")
+    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -ffpe-trap=invalid,zero,overflow -fcheck=bounds -fbacktrace -fno-range-check -Wall")
   elseif (${CMAKE_BUILD_TYPE} MATCHES "Bitforbit")
-    set (CMAKE_C_FLAGS        "${CMAKE_C_FLAGS} -g")
-    set (CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS} -g")
-    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -g")
+    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS}")
   endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
   set (CMAKE_Fortran_FLAGS_DEFAULT_PREC "-fdefault-real-8 -fdefault-double-8")
 elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "PGI")
@@ -114,9 +119,9 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
     set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fstack-protector-all -fpe0 -traceback -debug -ftrapuv")
   elseif (${CMAKE_BUILD_TYPE} MATCHES "Bitforbit")
     if(LEGACY_INTEL)
-      set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model strict -qoverride-limits -g -traceback")
+      set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model strict -qoverride-limits -traceback")
     else(LEGACY_INTEL)
-    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model consistent -qoverride-limits -g -traceback")
+    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model consistent -qoverride-limits -traceback")
     endif (LEGACY_INTEL)
   elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
     # Specify aggressive optimization flags (to be overwritten for individual files in ccpp-physics' CMakeLists.txt)
@@ -254,12 +259,20 @@ endif(MKL_DIR)
 
 #------------------------------------------------------------------------------
 # Set netCDF flags for preprocessor, compiler and linker (if defined)
+# Legacy settings for old make build
 if(NETCDF_DIR)
   set (NETCDF_INC "-I${NETCDF_DIR}/include")
   set (NETCDF_LIB "-L${NETCDF_DIR}/lib -lnetcdff -lnetcdf")
   set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${NETCDF_INC} ${NETCDF_LIB}")
   ADD_DEFINITIONS(-DNETCDF)
   message (STATUS "Enable netCDF support")
+# Settings for new cmake build
+elseif (NETCDF_INC_DIR AND NETCDF_LIBDIR)
+  set (NETCDF_INC "-I${NETCDF_INC_DIR}")
+  set (NETCDF_LIB "-L${NETCDF_LIBDIR} -lnetcdff -lnetcdf")
+  set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${NETCDF_INC} ${NETCDF_LIB}")
+  ADD_DEFINITIONS(-DNETCDF)
+  message (STATUS "Enable netCDF support")
 else(NETCDF_DIR)
   message (STATUS "Disable netCDF support")
 endif(NETCDF_DIR)

ccpp/build_ccpp.sh

@@ -219,7 +219,7 @@ else
     CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp ${CCPP_XML2_LIB}"
   fi
 fi
-echo "ESMF_DEP_INCPATH=-I${PATH_CCPP_INC}" > ${CCPP_MK}
+echo "ESMF_DEP_INCPATH=${PATH_CCPP_INC}" > ${CCPP_MK}
 echo "ESMF_DEP_LINK_OBJS=${CCPP_LINK_OBJS}" >> ${CCPP_MK}
 
 if [ $clean_after = YES ]; then

ccpp/config/ccpp_prebuild_config.py

@@ -93,6 +93,7 @@
     'FV3/ccpp/physics/physics/module_mp_radar.F90',
     'FV3/ccpp/physics/physics/module_mp_thompson.F90',
     'FV3/ccpp/physics/physics/module_mp_thompson_make_number_concentrations.F90',
+    'FV3/ccpp/physics/physics/module_MP_FER_HIRES.F90',
     'FV3/ccpp/physics/physics/module_bl_mynn.F90',
     'FV3/ccpp/physics/physics/module_sf_mynn.F90',
     'FV3/ccpp/physics/physics/module_SF_JSFC.F90',
@@ -111,7 +112,9 @@
     'FV3/ccpp/physics/physics/cires_vert_wmsdis.F90',
     'FV3/ccpp/physics/physics/namelist_soilveg.f',
     'FV3/ccpp/physics/physics/mfpblt.f',
+    'FV3/ccpp/physics/physics/mfpbltq.f',
     'FV3/ccpp/physics/physics/mfscu.f',
+    'FV3/ccpp/physics/physics/mfscuq.f',
     'FV3/ccpp/physics/physics/noahmp_tables.f90',
     'FV3/ccpp/physics/physics/num_parthds.F',
     'FV3/ccpp/physics/physics/ozne_def.f',
@@ -188,6 +191,8 @@
     'FV3/ccpp/physics/physics/h2ophys.f'                         : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/samfdeepcnv.f'                     : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/samfshalcnv.f'                     : [ 'slow_physics' ],
+    'FV3/ccpp/physics/physics/sascnvn.F'                         : [ 'slow_physics' ],
+    'FV3/ccpp/physics/physics/shalcnv.F'                         : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/maximum_hourly_diagnostics.F90'    : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/m_micro.F90'                       : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/m_micro_interstitial.F90'          : [ 'slow_physics' ],
@@ -197,6 +202,7 @@
     'FV3/ccpp/physics/physics/moninedmf.f'                       : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/moninshoc.f'                       : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/satmedmfvdif.F'                    : [ 'slow_physics' ],
+    'FV3/ccpp/physics/physics/satmedmfvdifq.F'                   : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/shinhongvdif.F90'                  : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/ysuvdif.F90'                       : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/module_MYNNPBL_wrapper.F90'        : [ 'slow_physics' ],
@@ -225,15 +231,20 @@
     'FV3/ccpp/physics/physics/sfc_cice.f'                        : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_diff.f'                        : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_drv.f'                         : [ 'slow_physics' ],
-    'FV3/ccpp/physics/physics/sfc_noahmp_pre.F90'                : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_noahmp_drv.f'                  : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_nst.f'                         : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_ocean.F'                       : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/sfc_sice.f'                        : [ 'slow_physics' ],
+    # HAFS FER_HIRES
+    'FV3/ccpp/physics/physics/mp_fer_hires.F90'                  : [ 'slow_physics' ],
     # for testing the <init> and <finalize> sections
     'FV3/ccpp/physics/physics/GFS_suite_init_finalize_test.F90'  : [ 'slow_physics' ],
     }
 
+# Default build dir, relative to current working directory,
+# if not specified as command-line argument
+DEFAULT_BUILD_DIR = 'FV3'
+
 # Auto-generated makefile/cmakefile snippets that contain all schemes
 SCHEMES_MAKEFILE   = '{build_dir}/ccpp/physics/CCPP_SCHEMES.mk'
 SCHEMES_CMAKEFILE  = '{build_dir}/ccpp/physics/CCPP_SCHEMES.cmake'
@@ -317,6 +328,14 @@
             'tendency_of_ice_friendly_aerosols_at_surface',
             ],
         },
+    'mp_fer_hires' : {
+        'mp_fer_hires_init' : [
+            'fraction_of_ice_water_cloud',
+            'fraction_of_rain_water_cloud',
+            'rime_factor',
+            ],
+        },
+
     #'subroutine_name_1' : 'all',
     #'subroutine_name_2' : 'none',
     #'subroutine_name_2' : [ 'var1', 'var3'],

ccpp/suites/suite_FV3_CPT_v0.xml

@@ -64,6 +64,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys_2015</scheme>
@@ -77,7 +78,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>
@@ -69,7 +70,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017_coupled.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_2017_coupled" lib="ccppphys" ver="3">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </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>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_ocean</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_cice</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>dcyc2t3_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>hedmf</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+       <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>zhaocarr_gscond</scheme>
+      <scheme>zhaocarr_precpd</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>

ccpp/suites/suite_FV3_GFS_2017_csawmg.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys_2015</scheme>
@@ -72,7 +73,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys_2015</scheme>

ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml

@@ -64,6 +64,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>
@@ -74,7 +75,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml

@@ -47,7 +47,6 @@
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
-      <scheme>sfc_noahmp_pre</scheme>
       <scheme>noahmpdrv</scheme>
       <scheme>sfc_sice</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
@@ -65,6 +64,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>
@@ -75,7 +75,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>
@@ -69,7 +70,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>

ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>

ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml

@@ -59,6 +59,7 @@
       <scheme>GFS_GWD_generic_pre</scheme>
       <scheme>cires_ugwp</scheme>
       <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys</scheme>
@@ -70,7 +71,6 @@
       <scheme>GFS_DCNV_generic_post</scheme>
       <scheme>GFS_SCNV_generic_pre</scheme>
       <scheme>samfshalcnv</scheme>
-      <scheme>samfshalcnv_post</scheme>
       <scheme>GFS_SCNV_generic_post</scheme>
       <scheme>GFS_suite_interstitial_4</scheme>
       <scheme>cnvc90</scheme>