Merge pull request #82 from grantfirl/ufs-dev-PR22

UFS-dev PR#22
NCAR · Jan 17, 2023 · 81ce8f0 · 81ce8f0
2 parents 4b1c00c + 8c75379
commit 81ce8f0
Show file tree

Hide file tree

Showing 50 changed files with 1,797 additions and 1,760 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/parm/diag_table/diag_table_rap b/tests/parm/diag_table/diag_table_rap
@@ -300,6 +300,44 @@
 "gfs_sfc",     "snowfall_acc",     "snowfall_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_sfc",     "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d",  "all",  .false.,  "none",  2
 
+# Diagnostic variables for Unified Gravity Wave Physics (UGWP)
+"gfs_phys",    "dws3dt_ogw",  "dws3dt_ogw",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dws3dt_obl",  "dws3dt_obl",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dws3dt_oss",  "dws3dt_oss",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dws3dt_ofd",  "dws3dt_ofd",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldu3dt_ogw",  "ldu3dt_ogw",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldu3dt_obl",  "ldu3dt_obl",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldu3dt_oss",  "ldu3dt_oss",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldu3dt_ofd",  "ldu3dt_ofd",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldu3dt_ngw",  "ldu3dt_ngw",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldv3dt_ngw",  "ldv3dt_ngw",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ldt3dt_ngw",  "ldt3dt_ngw",     "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_phys",    "dudt_ogw",    "dudt_ogw",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dvdt_ogw",    "dvdt_ogw",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dudt_obl",    "dudt_obl",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dvdt_obl",    "dvdt_obl",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dudt_oss",    "dudt_oss",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dvdt_oss",    "dvdt_oss",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dudt_ofd",    "dudt_ofd",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dvdt_ofd",    "dvdt_ofd",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du_ogwcol",   "du_ogwcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv_ogwcol",   "dv_ogwcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du_oblcol",   "du_oblcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv_oblcol",   "dv_oblcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du_osscol",   "du_osscol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv_osscol",   "dv_osscol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du_ofdcol",   "du_ofdcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv_ofdcol",   "dv_ofdcol",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du3_ogwcol",  "du3_ogwcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv3_ogwcol",  "dv3_ogwcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du3_oblcol",  "du3_oblcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv3_oblcol",  "dv3_oblcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du3_osscol",  "du3_osscol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv3_osscol",  "dv3_osscol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "du3_ofdcol",  "du3_ofdcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dv3_ofdcol",  "dv3_ofdcol",     "fv3_history2d",  "all",  .false.,  "none",  2
+
 #=============================================================================================
 #
 #====> This file can be used with diag_manager/v2.0a (or higher) <====

diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN
@@ -197,7 +197,6 @@ deflate_level=1
   cplwav       = @[CPLWAV]
   cplwav2atm   = @[CPLWAV2ATM]
   effr_in      = .true.
-  ldiag_ugwp           = .false.
   do_ugwp              = @[DO_UGWP]
   do_tofd              = @[DO_TOFD]
   gwd_opt              = @[GWD_OPT]

diff --git a/tests/rt.ncar.sh b/tests/rt.ncar.sh
@@ -444,7 +444,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221230
+BL_DATE=20220109
 
 RTPWD=${RTPWD:-$DISKNM/NCAR/main-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221212
+BL_DATE=20221220
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/hrrr_control b/tests/tests/hrrr_control
@@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_2threads b/tests/tests/hrrr_control_2threads
@@ -78,7 +78,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_2threads_dyn32_phy32 b/tests/tests/hrrr_control_2threads_dyn32_phy32
@@ -79,7 +79,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_debug b/tests/tests/hrrr_control_debug
@@ -31,7 +31,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_debug_dyn32_phy32 b/tests/tests/hrrr_control_debug_dyn32_phy32
@@ -31,7 +31,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_decomp b/tests/tests/hrrr_control_decomp
@@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_decomp_dyn32_phy32 b/tests/tests/hrrr_control_decomp_dyn32_phy32
@@ -76,7 +76,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 

diff --git a/tests/tests/hrrr_control_dyn32_phy32 b/tests/tests/hrrr_control_dyn32_phy32
@@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export SFCLAY_COMPUTE_FLUX=.true.
 export LHEATSTRG=.false.

diff --git a/tests/tests/hrrr_control_restart b/tests/tests/hrrr_control_restart
@@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 
 export SFCLAY_COMPUTE_FLUX=.true.

diff --git a/tests/tests/hrrr_control_restart_dyn32_phy32 b/tests/tests/hrrr_control_restart_dyn32_phy32
@@ -71,7 +71,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 
 export SFCLAY_COMPUTE_FLUX=.true.

diff --git a/tests/tests/rap_2threads b/tests/tests/rap_2threads
@@ -78,7 +78,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_2threads_dyn32_phy32 b/tests/tests/rap_2threads_dyn32_phy32
@@ -79,7 +79,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_cires_ugwp_debug b/tests/tests/rap_cires_ugwp_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_cires_ugwp
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_control b/tests/tests/rap_control
@@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_control_debug b/tests/tests/rap_control_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_control_debug_dyn32_phy32 b/tests/tests/rap_control_debug_dyn32_phy32
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_control_dyn32_phy32 b/tests/tests/rap_control_dyn32_phy32
@@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_control_dyn64_phy32 b/tests/tests/rap_control_dyn64_phy32
@@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_control_dyn64_phy32_debug b/tests/tests/rap_control_dyn64_phy32_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_decomp b/tests/tests/rap_decomp
@@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_diag_debug b/tests/tests/rap_diag_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_flake_debug b/tests/tests/rap_flake_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_flake
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_lndp_debug b/tests/tests/rap_lndp_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_noah_debug b/tests/tests/rap_noah_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_noah
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap_noah
+export DIAG_TABLE=diag_table_rap_noah
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_noah_sfcdiff_cires_ugwp_debug b/tests/tests/rap_noah_sfcdiff_cires_ugwp_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_noah_sfcdiff_cires_ugwp
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap_noah
+export DIAG_TABLE=diag_table_rap_noah
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_progcld_thompson_debug b/tests/tests/rap_progcld_thompson_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_progcld_thompson_rrtmgp_debug b/tests/tests/rap_progcld_thompson_rrtmgp_debug
@@ -31,7 +31,7 @@ export OUTPUT_FH="0 1"
 export FV3_RUN=control_run.IN
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0
@@ -64,4 +64,4 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export CCPP_SUITE=FV3_RAP_RRTMGP
 export DO_RRTMGP=.true.
 export DOGP_CLDOPTICS_LUT=.true.
-export DOGP_LWSCAT=.true.
+export DOGP_LWSCAT=.true.
diff --git a/tests/tests/rap_restart b/tests/tests/rap_restart
@@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 
 export LHEATSTRG=.false.

diff --git a/tests/tests/rap_restart_dyn32_phy32 b/tests/tests/rap_restart_dyn32_phy32
@@ -71,7 +71,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_rrtmgp b/tests/tests/rap_rrtmgp
@@ -71,7 +71,7 @@ export OUTPUT_FH='0 09 12'
 export FV3_RUN=control_run.IN
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_rrtmgp_debug b/tests/tests/rap_rrtmgp_debug
@@ -31,7 +31,7 @@ export OUTPUT_FH="0 1"
 export FV3_RUN=control_run.IN
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_sfcdiff b/tests/tests/rap_sfcdiff
@@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_sfcdiff
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_sfcdiff_debug b/tests/tests/rap_sfcdiff_debug
@@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_sfcdiff
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export IMP_PHYSICS=8
 export DNATS=0

diff --git a/tests/tests/rap_sfcdiff_decomp b/tests/tests/rap_sfcdiff_decomp
@@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_sfcdiff
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 
 export LHEATSTRG=.false.
 export IMP_PHYSICS=8

diff --git a/tests/tests/rap_sfcdiff_restart b/tests/tests/rap_sfcdiff_restart
@@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_RAP_sfcdiff
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
-export NEW_DIAGTABLE=diag_table_rap
+export DIAG_TABLE=diag_table_rap
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 
 export LHEATSTRG=.false.
+4 −2		ccpp/data/CCPP_typedefs.F90
+4 −4		ccpp/data/CCPP_typedefs.meta
+77 −49		ccpp/data/GFS_typedefs.F90
+192 −34		ccpp/data/GFS_typedefs.meta
+414 −2		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+963 −837		io/FV3GFS_io.F90