Changes to regression test files for recent changes to RRTMG and RRTM…

…GP. (NOAA-EMC#262) * Changes to regression test files for recent changes to RRTMG and RRTMGP. * Removed redundant importing of kind_phys in physics * add units to index_for_diagnostic_printout metadata * Replace iovr_{lw,sw} with iovr for HWRF regression tests * Bugfix in GP sampling routines. * Increase number of nodes for test fv3_ccpp_gocart_clm on Cheyenne Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
zhanglikate · Nov 13, 2020 · 2e25df5 · 2e25df5
1 parent 4e8ef6a
commit 2e25df5
Show file tree

Hide file tree

Showing 29 changed files with 2,318 additions and 968 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/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -222,8 +222,7 @@ export NA_INIT=1
 # Radiation
 export DO_RRTMGP=.F.
 export ICLOUD=0
-export IOVR_LW=1
-export IOVR_SW=1
+export IOVR=1
 
 # Microphysics
 export IMP_PHYSICS=11

diff --git a/tests/fv3_conf/ccpp_c96_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/ccpp_c96_HAFS_v0_hwrf_run.IN
@@ -40,7 +40,7 @@ cp    @[RTPWD]/FV3_input_data_hafs/VEGPARM.TBL .
 if [ $IMP_PHYSICS = 8 ]; then
   cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_noah diag_table
 elif [ $IMP_PHYSICS = 15 ]; then
-  if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
+  if [ $IOVR = 4 ]; then
     cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
   else
     cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table

diff --git a/tests/fv3_conf/ccpp_esg_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/ccpp_esg_HAFS_v0_hwrf_run.IN
@@ -12,7 +12,7 @@ fi
 if [ $IMP_PHYSICS = 8 ]; then
   ln -sf diag_table.thompson diag_table
 elif [ $IMP_PHYSICS = 15 ]; then
-  if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
+  if [ $IOVR = 4 ]; then
     cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
   else
     cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table

diff --git a/tests/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN b/tests/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN
@@ -132,8 +132,7 @@
   ltaerosol      = @[LTAEROSOL]  ! HWRF Thompson
   effr_in        = @[EFFR_IN]    ! HWRF Thompson
   icloud         = 3             ! HWRF RRTMG
-  iovr_lw        = 4             ! HWRF RRTMG
-  iovr_sw        = 4             ! HWRF RRTMG
+  iovr           = 4             ! HWRF RRTMG
   hwrf_samfdeep  = .true.        ! HWRF SASdeep
   hwrf_samfshal  = .true.        ! HWRF SASshal
   asolfac_deep   = 0.89          ! HWRF SASdeep; GFS SAS:0.958

diff --git a/tests/parm/ccpp_esg_HAFS_v0_hwrf.nml.IN b/tests/parm/ccpp_esg_HAFS_v0_hwrf.nml.IN
@@ -141,8 +141,7 @@
   ltaerosol      = @[LTAEROSOL]  ! HWRF Thompson
   effr_in        = @[EFFR_IN]    ! HWRF Thompson
   icloud         = 3             ! HWRF RRTMG
-  iovr_lw        = 4             ! HWRF RRTMG
-  iovr_sw        = 4             ! HWRF RRTMG
+  iovr           = 4             ! HWRF RRTMG
   hwrf_samfdeep  = .true.        ! HWRF SASdeep
   hwrf_samfshal  = .true.        ! HWRF SASshal
   asolfac_deep   = 0.89          ! HWRF SASdeep; GFS SAS:0.958

diff --git a/tests/parm/ccpp_v16beta_c96.nml.IN b/tests/parm/ccpp_v16beta_c96.nml.IN
@@ -135,8 +135,7 @@ deflate_level=1
   iems         = 1
   iaer         = 5111
   icliq_sw     = 2
-  iovr_lw      = 3
-  iovr_sw      = 3
+  iovr         = 3
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN b/tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN
@@ -135,8 +135,7 @@ deflate_level=1
   iems         = 1
   iaer         = 5111
   icliq_sw     = 2
-  iovr_lw      = 3
-  iovr_sw      = 3
+  iovr         = 3
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/ccpp_v16beta_flake_c96.nml.IN b/tests/parm/ccpp_v16beta_flake_c96.nml.IN
@@ -135,8 +135,7 @@ deflate_level=1
   iems         = 1
   iaer         = 5111
   icliq_sw     = 2
-  iovr_lw      = 3
-  iovr_sw      = 3
+  iovr         = 3
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/input.benchmark.nml.IN b/tests/parm/input.benchmark.nml.IN
@@ -151,8 +151,7 @@
   iems         = 1
   iaer         = 111
   icliq_sw     = 1
-  iovr_lw      = 1
-  iovr_sw      = 1
+  iovr         = 1
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN
@@ -154,8 +154,7 @@
   iems         = 1
   iaer         = 111
   icliq_sw     = 1
-  iovr_lw      = 1
-  iovr_sw      = 1
+  iovr         = 1
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/v16beta_c96.nml.IN b/tests/parm/v16beta_c96.nml.IN
@@ -134,8 +134,7 @@ deflate_level=1
   iems         = 1
   iaer         = 5111
   icliq_sw     = 2
-  iovr_lw      = 3
-  iovr_sw      = 3
+  iovr         = 3
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -114,12 +114,12 @@ RUN     | fv3_ccpp_gfs_v15p2
 RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    | orion.intel    | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    | cheyenne.intel | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | hera.intel     | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | orion.intel    | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | cheyenne.intel | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | hera.intel     | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | orion.intel    | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | orion.intel    | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | orion.intel    | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    | cheyenne.intel | fv3         |
 
 COMPILE | CCPP=Y SUITES=FV3_GFS_v16_csawmg                                                                                               | standard    |                | fv3         |
 # fv3_ccpp_gfsv16_csawmg and fv3_ccpp_gfsv16_csawmgt crash with a "bus error" on cheyenne.intel, turn off
@@ -155,12 +155,12 @@ RUN     | fv3_ccpp_gfs_v15p2_debug
 RUN     | fv3_ccpp_gfs_v16beta_debug                                                                                                     | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta_debug                                                                                                     | standard    | orion.intel    | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta_debug                                                                                                     | standard    | cheyenne.intel | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | hera.intel     | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | orion.intel    | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | cheyenne.intel | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | hera.intel     | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | orion.intel    | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | orion.intel    | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | orion.intel    | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    | cheyenne.intel | fv3         |
 
 COMPILE | CCPP=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y                                                  | standard    |                | fv3         |
 RUN     | fv3_ccpp_gsd_debug                                                                                                             | standard    |                | fv3         |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -400,9 +400,9 @@ if [[ $SINGLE_NAME != '' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201106/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201110/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201106}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201110}
 fi
 
 shift $((OPTIND-1))

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -10,8 +10,8 @@ COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v16beta_flake,FV3_
 RUN     | fv3_ccpp_gfs_v15p2                                                                                                             | standard    |                | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    |                | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta_flake                                                                                                     | standard    |                | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    |                | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    |                | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                                      | standard    |                | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP                                                                                                    | standard    |                | fv3         |
 
 COMPILE | CCPP=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y                                                          | standard    |                | fv3         |
 
@@ -36,8 +36,8 @@ RUN     | fv3_ccpp_control_debug
 COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16beta_RRTMGP DEBUG=Y                                | standard    |                | fv3         |
 RUN     | fv3_ccpp_gfs_v15p2_debug                                                                                                       | standard    |                | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta_debug                                                                                                     | standard    |                | fv3         |
-#RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    |                | fv3         |
-#RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    |                | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                                | standard    |                | fv3         |
+RUN     | fv3_ccpp_gfs_v16beta_RRTMGP_debug                                                                                              | standard    |                | fv3         |
 
 COMPILE | CCPP=Y SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                        | standard    |                | fv3         |
 RUN     | fv3_ccpp_multigases                                                                                                            | standard    |                | fv3         |

diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf b/tests/tests/fv3_ccpp_HAFS_v0_hwrf
@@ -96,8 +96,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug b/tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug
@@ -99,8 +99,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson b/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson
@@ -98,8 +98,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug
@@ -101,8 +101,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson b/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson
@@ -52,8 +52,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
@@ -52,8 +52,7 @@ export MONINQFAC=-1.0
 
 #HWRF options for RRTMG
 export ICLOUD=3
-export IOVR_LW=4
-export IOVR_SW=4
+export IOVR=4
 
 #HWRF NOAH LSM
 export LSM=4

diff --git a/tests/tests/fv3_ccpp_gocart_clm b/tests/tests/fv3_ccpp_gocart_clm
@@ -68,3 +68,8 @@ export CCPP_SUITE=FV3_GFS_2017_gfdlmp
 export CCPP_LIB_DIR=ccpp/lib
 export INPUT_NML=ccpp.gocart.nml.IN
 
+# Increase the number of nodes on Cheyenne to avoid out of memory errors
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  # Use 30 instead of 36 tasks per node
+  export TPN=30
+fi
+1 −1		ccpp/physics
+53 −25		gfsphysics/GFS_layer/GFS_typedefs.F90
+81 −9		gfsphysics/GFS_layer/GFS_typedefs.meta