add updates for suites, tests for P8

* add new coupled and standalone P8 suites which are copies of the P7 nsstNoahmpUGWPv1 suites * retain nsstNoahmpUGWPv1_p7 suite for p7 versions of rrtmgp * make using cice albedos the default for cpld P8 tests * the standalone retains the value false since CICE is not active
ufs-community · DeniseWorthen · Jan 13, 2022 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
commit ada56c443d3aa54bfa3a99c9c3ed1bbb1969f899
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
  path = FV3
- url = https://github.com/NOAA-EMC/fv3atm
- branch = develop
+ #url = https://github.com/NOAA-EMC/fv3atm
+ #branch = develop
+ url = https://github.com/DeniseWorthen/fv3atm
+ branch = feature/p8suites
 [submodule "WW3"]
  path = WW3
  url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1059,7 +1059,7 @@ export ATMTILESIZE=`expr $NPX - 1`
 
 # FV3 defaults
 export FRAC_GRID=.true.
-export CCPP_SUITE=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_coupled_p8
 export INPUT_NML=cpld_control.nml.IN
 export FIELD_TABLE=field_table_gfsv16
 export DIAG_TABLE=diag_table_template

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -2,12 +2,12 @@
 # S2S tests #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp  | - wcoss_cray | fv3 |
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 | - wcoss_cray | fv3 |
 RUN | cpld_control_p8 | - wcoss_cray | fv3 |
 RUN | cpld_2threads_p8 | - wcoss_cray | |
 RUN | cpld_decomp_p8 | - wcoss_cray jet.intel | |
 RUN | cpld_mpi_p8 | - wcoss_cray | |
-RUN | cpld_control_p8_rrtmgp | - wcoss_cray cheyenne.intel | fv3 |
+RUN | cpld_control_p7_rrtmgp | - wcoss_cray   | fv3 |
 
 RUN | cpld_bmark_p7 | - wcoss_cray | fv3 |
 RUN | cpld_bmark_p8 | - wcoss_cray | fv3 |
@@ -23,15 +23,14 @@ RUN | cpld_restart_c192_p8
 RUN | cpld_control_c384_p8 | - wcoss_cray | fv3 |
 RUN | cpld_restart_c384_p8 | - wcoss_cray | | cpld_control_c384_p8
 
-COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | - wcoss_cray | fv3 |
+COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_p8  | - wcoss_cray | fv3 |
 RUN | cpld_debug_p8 | - wcoss_cray | fv3 |
 
 ###################################################################################################################################################################################
 # PROD tests #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v16_nsstNoahmpUGWPv1,FV3_GFS_v16_p7_rrtmgp -D32BIT=ON | | fv3 |
-
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v16_p7_rrtmgp,FV3_GFS_v16_p8 -D32BIT=ON | | fv3 |
 RUN | control | | fv3 |
 RUN | control_decomp | | |
 RUN | control_2threads | - wcoss_cray | |
@@ -53,7 +52,7 @@ RUN | control_p8
 RUN | control_restart_p8 | | | control_p8
 RUN | control_decomp_p8 | | |
 RUN | control_2threads_p8 | - wcoss_cray | |
-RUN | control_p8_rrtmgp |- cheyenne.intel | fv3 |
+RUN | control_p7_rrtmgp |  | fv3 |
 
 RUN | regional_control | | fv3 |
 RUN | regional_restart | | | regional_control
@@ -78,7 +77,7 @@ RUN | rap_sfcdiff_restart
 RUN | hrrr_control | | fv3 |
 RUN | rrfs_v1beta | | fv3 |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp |  | fv3 |
 # fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
 RUN | control_rrtmgp | | fv3 |
 #RUN | control_rrtmgp_2threads | | |
@@ -99,7 +98,7 @@ RUN | control_wam
 # DEBUG tests #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON | | fv3 |
+COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v16_p8 -D32BIT=ON | | fv3 |
 
 RUN | control_debug | | fv3 |
 RUN | control_2threads_debug | - wcoss_cray | |

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -2,7 +2,7 @@
 # CCPP PROD tests #
 ##################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v16_nsstNoahmpUGWPv1 | | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v16_p8 | | fv3 |
 
 RUN | control | | fv3 |
 RUN | control_restart | | | control
@@ -63,8 +63,8 @@ RUN | control_wam_debug
 ##################################################################################################################################################################
 
 # Waves off
-COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | | fv3 |
+COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v16_coupled_p8  | | fv3 |
 RUN | cpld_control_c96_p8 | | fv3 |
 
-COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | | fv3 |
+COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_p8  | | fv3 |
 RUN | cpld_debug_p8 | | fv3 |
diff --git a/tests/tests/control_2threads_p8 b/tests/tests/control_2threads_p8
@@ -141,11 +141,11 @@ export FSICL=99999
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8
-export USE_CICE_ALB=.true.
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_p8
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7
 export INPUT_NML=cpld_control.nml.IN
diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8
@@ -100,11 +100,11 @@ export FSICL=99999
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8
-export USE_CICE_ALB=.true.
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_p8
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7
 export INPUT_NML=cpld_control.nml.IN
diff --git a/tests/tests/control_decomp_p8 b/tests/tests/control_decomp_p8
@@ -138,12 +138,12 @@ export FSICL=99999
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8
-export USE_CICE_ALB=.true.
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
 
 # P7
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_p8
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7
 export INPUT_NML=cpld_control.nml.IN
diff --git a/tests/tests/control_p8_rrtmgp → tests/tests/control_p7_rrtmgp b/tests/tests/control_p8_rrtmgp → tests/tests/control_p7_rrtmgp
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-# Global control test GFSv16 atmosphere only at C96L127, P8 configuration + RRTMGP
+# Global control test GFSv16 atmosphere only at C96L127, P7 configuration + RRTMGP
 #
 ###############################################################################
 
 export TEST_DESCR="Compare global control results with previous trunk version"
 
-export CNTL_DIR=control_p8_rrtmgp
+export CNTL_DIR=control_p7_rrtmgp
 
 export LIST_FILES="sfcf000.nc \
  sfcf021.nc \
@@ -144,12 +144,8 @@ export MOM6_RESTART_SETTING=n
 
 # RRTMGP
 export DO_RRTMGP=.true.
-# P8
-export USE_CICE_ALB=.true.
 
 export FV3_RUN=control_run.IN
-#TODO:need naming convention which does not require
-#updating suite file each prototype
 export CCPP_SUITE=FV3_GFS_v16_p7_rrtmgp
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7

diff --git a/tests/tests/control_p8 b/tests/tests/control_p8
@@ -140,11 +140,11 @@ export FSICL=99999
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8
-export USE_CICE_ALB=.true.
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_p8
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7
 export INPUT_NML=cpld_control.nml.IN
diff --git a/tests/tests/control_restart_p8 b/tests/tests/control_restart_p8
@@ -138,11 +138,11 @@ export FSICL=99999
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8
-export USE_CICE_ALB=.true.
+# P8 (not used for standalone)
+export USE_CICE_ALB=.false.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_p8
 export DIAG_TABLE=diag_table_gfsv16_merra2
 # use same namelist for standalone,coupled P7
 export INPUT_NML=cpld_control.nml.IN
diff --git a/tests/tests/cpld_bmark_p7_35d b/tests/tests/cpld_bmark_p7_35d
@@ -42,6 +42,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -83,6 +83,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
@@ -17,10 +17,10 @@ export SHOUR=00
 export SECS=`expr $SHOUR \* 3600`
 export BMIC=.true.
 
-export DAYS=35
-export FHMAX=840
+#export DAYS=35
+#export FHMAX=840
 export RESTART_N=`expr ${FHMAX} - ${FHROT}`
-export WLCLK=480
+#export WLCLK=480
 
 export TASKS=1700
 export TPN=$TPN_cpl_thrd
@@ -42,6 +42,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_control_p8_rrtmgp → tests/tests/cpld_control_p7_rrtmgp b/tests/tests/cpld_control_p8_rrtmgp → tests/tests/cpld_control_p7_rrtmgp
@@ -1,10 +1,10 @@
 #
-# cpld_control P8 test
+# cpld_control P7 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 + RRTMGP"
 
-export CNTL_DIR="cpld_control_p8_rrtmgp"
+export CNTL_DIR="cpld_control_p7_rrtmgp"
 
 export LIST_FILES="sfcf024.tile1.nc \
  sfcf024.tile2.nc \
@@ -67,7 +67,5 @@ export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
 export DO_RRTMGP=.true.
-#TODO:need naming convention which does not require
-#updating suite file each prototype
 export CCPP_SUITE=FV3_GFS_v16_coupled_p7_rrtmgp
 export INPUT_NML=cpld_control_rrtmgp.nml.IN