diff --git a/.gitmodules b/.gitmodules index 8b5b737335..ed460a3963 100644 --- 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/dustinswales/fv3atm + branch = add_GPorts [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index cf1547fc0f..40c1153544 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit cf1547fc0f8b86823c40afd64908718cd1ece734 +Subproject commit 40c11535445be8e4b57c826b3910855d76f8acbd diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 447bb4aace..14315a1364 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -36,7 +36,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then TASKS_cpl_dflt=196; TPN_cpl_dflt=28; INPES_cpl_dflt=3; JNPES_cpl_dflt=8 THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" - OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 177"; WPB_cpl_dflt="178 195" + OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 177"; WPB_cpl_dflt="178 195" NPROC_ICE_cpl_dflt=8 TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 @@ -170,7 +170,7 @@ elif [[ $MACHINE_ID = orion.* ]]; then TASKS_cpl_dflt=200; TPN_cpl_dflt=40; INPES_cpl_dflt=3; JNPES_cpl_dflt=8 THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" - OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199" + OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199" NPROC_ICE_cpl_dflt=10 TASKS_cpl_thrd=120; TPN_cpl_thrd=20; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 @@ -1036,7 +1036,7 @@ export eps_imesh=1.0e-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 @@ -1120,6 +1120,9 @@ export USE_CICE_ALB=.false. export KTHERM=2 export TFREEZE_OPTION=mushy +# P8 RRTMGP +export DO_RRTMGP=.true. + export CPLFLX=.true. export CPLICE=.true. export CPL=.true. diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN index 7579dece75..6785b455f0 100644 --- a/tests/fv3_conf/cpld_control_run.IN +++ b/tests/fv3_conf/cpld_control_run.IN @@ -18,6 +18,11 @@ else ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES} fi +# RRTMGP +if [ $DO_RRTMGP = .true. ]; then + cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* . +fi + # FV3 fixed input cp @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt . cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat . diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN index 1ae06417c5..d20dfc2b89 100644 --- a/tests/parm/cpld_control.nml.IN +++ b/tests/parm/cpld_control.nml.IN @@ -212,6 +212,20 @@ deflate_level=1 do_gsl_drag_tofd = @[DO_GSL_DRAG_TOFD] do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY] do_ugwp_v0_nst_only = @[DO_UGWP_V0_NST_ONLY] + do_RRTMGP = @[DO_RRTMGP] + active_gases = 'h2o_co2_o3_n2o_ch4_o2' + ngases = 6 + lw_file_gas = 'rrtmgp-data-lw-g128-210809.nc' + lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc' + sw_file_gas = 'rrtmgp-data-sw-g112-210809.nc' + sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc' + rrtmgp_nGptsSW = 112 + rrtmgp_nGptsLW = 128 + rrtmgp_nBandsLW = 16 + rrtmgp_nBandsSW = 14 + doGP_cldoptics_LUT = .true. + doGP_lwscat = .true. + use_LW_jacobian = .false. / &gfdl_cloud_microphysics_nml diff --git a/tests/rt.conf b/tests/rt.conf index 6fee0f50d5..ce624553aa 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -2,34 +2,34 @@ # S2S tests # ################################################################################################################################################################################### -COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | - wcoss_cray | fv3 | -RUN | cpld_control_p7 | - wcoss_cray | fv3 | -RUN | cpld_2threads_p7 | - wcoss_cray | | -RUN | cpld_decomp_p7 | - wcoss_cray jet.intel | | -RUN | cpld_mpi_p7 | - wcoss_cray | | +COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,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_bmark_p7 | - wcoss_cray | fv3 | -RUN | cpld_bmark_mpi_p7 | - wcoss_cray | | +RUN | cpld_bmark_p8 | - wcoss_cray | fv3 | +RUN | cpld_bmark_mpi_p8 | - wcoss_cray | | -# Waves off for restart and debug tests -RUN | cpld_control_c96_p7 | - wcoss_cray | fv3 | -RUN | cpld_restart_c96_p7 | - wcoss_cray | | cpld_control_c96_p7 +# Waves off for restart and debug tests +RUN | cpld_control_c96_p8 | - wcoss_cray | fv3 | +RUN | cpld_restart_c96_p8 | - wcoss_cray | | cpld_control_c96_p8 +RUN | cpld_control_c192_p8 | - wcoss_cray | fv3 | +RUN | cpld_restart_c192_p8 | - wcoss_cray | | cpld_control_c192_p8 -RUN | cpld_control_c192_p7 | - wcoss_cray | fv3 | -RUN | cpld_restart_c192_p7 | - wcoss_cray | | cpld_control_c192_p7 +RUN | cpld_control_c384_p8 | - wcoss_cray | fv3 | +RUN | cpld_restart_c384_p8 | - wcoss_cray | | cpld_control_c384_p8 -RUN | cpld_control_c384_p7 | - wcoss_cray | fv3 | -RUN | cpld_restart_c384_p7 | - wcoss_cray | | cpld_control_c384_p7 - -COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | - wcoss_cray | fv3 | -RUN | cpld_debug_p7 | - 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_GSD_v0,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON | | fv3 | +COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GSD_v0,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_p8 -D32BIT=ON | | fv3 | RUN | control | | fv3 | RUN | control_decomp | | | @@ -46,10 +46,10 @@ RUN | control_stochy RUN | control_stochy_restart | | | control_stochy RUN | control_lndp | | fv3 | -RUN | control_p7 | | fv3 | -RUN | control_restart_p7 | | | control_p7 -RUN | control_decomp_p7 | | | -RUN | control_2threads_p7 | - wcoss_cray | | +RUN | control_p8 | | fv3 | +RUN | control_restart_p8 | | | control_p8 +RUN | control_decomp_p8 | | | +RUN | control_2threads_p8 | - wcoss_cray | | RUN | regional_control | | fv3 | RUN | regional_restart | | fv3 | regional_control @@ -96,7 +96,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_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,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_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_p8 -D32BIT=ON | | fv3 | RUN | control_debug | | fv3 | RUN | control_2threads_debug | - wcoss_cray | | RUN | control_CubedSphereGrid_debug | | fv3 | @@ -108,7 +108,7 @@ RUN | control_csawmg_debug RUN | control_csawmgt_debug | | fv3 | RUN | control_ras_debug | | fv3 | RUN | control_diag_debug | | fv3 | -RUN | control_debug_p7 | | fv3 | +RUN | control_debug_p8 | | fv3 | RUN | control_thompson_debug | | fv3 | RUN | control_thompson_no_aero_debug | | fv3 | diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf index d4def12bb6..93408bab2f 100644 --- a/tests/rt_35d.conf +++ b/tests/rt_35d.conf @@ -2,7 +2,7 @@ # CPLD Benchmark 35d tests # ############################################################################################################################################################################### -COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | + hera.intel | fv3 | | +COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p8 | + hera.intel | fv3 | | RUN | cpld_bmark_p7_35d | | fv3 | | 2012010100 RUN | cpld_bmark_p7_35d | | fv3 | | 2012040100 RUN | cpld_bmark_p7_35d | | fv3 | | 2012070100 @@ -11,3 +11,12 @@ RUN | cpld_bmark_p7_35d RUN | cpld_bmark_p7_35d | | fv3 | | 2013040100 RUN | cpld_bmark_p7_35d | | fv3 | | 2013070100 RUN | cpld_bmark_p7_35d | | fv3 | | 2013100100 + +RUN | cpld_bmark_p8_35d | | fv3 | | 2012010100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2012040100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2012070100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2012100100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2013010100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2013040100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2013070100 +RUN | cpld_bmark_p8_35d | | fv3 | | 2013100100 diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf index fcf00b26c3..a9e67c8d6d 100644 --- 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_HAFS_v0_hwrf_thompson,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_HAFS_v0_hwrf_thompson,FV3_GFS_v16_p8 | | fv3 | RUN | control | | fv3 | RUN | control_restart | | | control @@ -13,7 +13,7 @@ RUN | control_rrtmgp RUN | control_thompson | | fv3 | RUN | control_thompson_no_aero | | fv3 | RUN | control_ras | | fv3 | -RUN | control_p7 | | fv3 | +RUN | control_p8 | | fv3 | RUN | fv3_HAFS_v0_hwrf_thompson | | fv3 | RUN | fv3_esg_HAFS_v0_hwrf_thompson | | fv3 | @@ -46,7 +46,7 @@ RUN | control_thompson_extdiag_debug RUN | control_rrtmgp_debug | | fv3 | RUN | control_ras_debug | | fv3 | RUN | control_stochy_debug | | fv3 | -RUN | control_debug_p7 | | fv3 | +RUN | control_debug_p8 | | fv3 | COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson -DDEBUG=ON | | fv3 | RUN | fv3_HAFS_v0_hwrf_thompson_debug | | fv3 | @@ -60,8 +60,8 @@ RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug ################################################################################################################################################################## # Waves off -COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | | fv3 | -RUN | cpld_control_c96_p7 | | 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 | -RUN | cpld_debug_p7 | | 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_p7 b/tests/tests/control_2threads_p8 similarity index 95% rename from tests/tests/control_2threads_p7 rename to tests/tests/control_2threads_p8 index 2daee34ee6..09108910a6 100644 --- a/tests/tests/control_2threads_p7 +++ b/tests/tests/control_2threads_p8 @@ -1,12 +1,12 @@ ############################################################################### # -# Global control 2thread test GFSv16 atmosphere only at C96L127, P7 configuration +# Global control 2thread test GFSv16 atmosphere only at C96L127, P8 configuration # ############################################################################### -export TEST_DESCR="Compare global control with 2 threads results with control_p7 test" +export TEST_DESCR="Compare global control with 2 threads results with control_p8 test" -export CNTL_DIR=control_p7 +export CNTL_DIR=control_p8 export LIST_FILES="sfcf000.nc \ sfcf024.nc \ @@ -137,6 +137,9 @@ export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" export LANDICE=".false." export FSICL=99999 +# P8 RRTMGP +export DO_RRTMGP=.true. + #required for NML.IN sharing export USE_CICE_ALB=.false. export MIN_SEAICE=0.15 @@ -144,7 +147,7 @@ export FRAC_GRID=.true. export MOM6_RESTART_SETTING=n export FV3_RUN=control_run.IN -export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1 +export CCPP_SUITE=FV3_GFS_v16_p8 export NEW_DIAGTABLE=diag_table_gfsv16_merra2 -# use same namelist for standalone,coupled P7 +# use same namelist for standalone,coupled export INPUT_NML=cpld_control.nml.IN diff --git a/tests/tests/control_debug_p7 b/tests/tests/control_debug_p8 similarity index 93% rename from tests/tests/control_debug_p7 rename to tests/tests/control_debug_p8 index 438d3b24f1..c120cb6a14 100644 --- a/tests/tests/control_debug_p7 +++ b/tests/tests/control_debug_p8 @@ -1,12 +1,12 @@ ############################################################################### # -# Global control debug test: GFSv16 atmosphere only at C96L127, P7 configuration +# Global control debug test: GFSv16 atmosphere only at C96L127, P8 configuration # ############################################################################### export TEST_DESCR="Compare global control debug results with previous trunk version" -export CNTL_DIR=control_debug_p7 +export CNTL_DIR=control_debug_p8 export LIST_FILES="sfcf000.nc \ sfcf001.nc \ @@ -96,6 +96,9 @@ export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" export LANDICE=".false." export FSICL=99999 +# P8 RRTMGP +export DO_RRTMGP=.true. + #required for NML.IN sharing export USE_CICE_ALB=.false. export MIN_SEAICE=0.15 @@ -103,7 +106,7 @@ export FRAC_GRID=.true. export MOM6_RESTART_SETTING=n export FV3_RUN=control_run.IN -export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1 +export CCPP_SUITE=FV3_GFS_v16_p8 export NEW_DIAGTABLE=diag_table_gfsv16_merra2 -# use same namelist for standalone,coupled P7 +# use same namelist for standalone,coupled export INPUT_NML=cpld_control.nml.IN diff --git a/tests/tests/control_decomp_p7 b/tests/tests/control_decomp_p8 similarity index 94% rename from tests/tests/control_decomp_p7 rename to tests/tests/control_decomp_p8 index 7ee87d7891..674191853c 100644 --- a/tests/tests/control_decomp_p7 +++ b/tests/tests/control_decomp_p8 @@ -1,12 +1,12 @@ ############################################################################### # -# Global control domain decomp test with differrent PEs, C96L127, P7 configuration +# Global control domain decomp test with differrent PEs, C96L127, P8 configuration # ############################################################################### -export TEST_DESCR="Compare global decomp results with control_p7 test" +export TEST_DESCR="Compare global decomp results with control_p8 test" -export CNTL_DIR=control_p7 +export CNTL_DIR=control_p8 export LIST_FILES="sfcf000.nc \ sfcf024.nc \ @@ -134,6 +134,9 @@ export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" export LANDICE=".false." export FSICL=99999 +# P8 RRTMGP +export DO_RRTMGP=.true. + #required for NML.IN sharing export USE_CICE_ALB=.false. export MIN_SEAICE=0.15 @@ -141,7 +144,7 @@ export FRAC_GRID=.true. export MOM6_RESTART_SETTING=n export FV3_RUN=control_run.IN -export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1 +export CCPP_SUITE=FV3_GFS_v16_p8 export NEW_DIAGTABLE=diag_table_gfsv16_merra2 -# use same namelist for standalone,coupled P7 +# use same namelist for standalone,coupled export INPUT_NML=cpld_control.nml.IN diff --git a/tests/tests/control_p7 b/tests/tests/control_p8 similarity index 95% rename from tests/tests/control_p7 rename to tests/tests/control_p8 index 41a2bc9fc1..501742ae7b 100644 --- a/tests/tests/control_p7 +++ b/tests/tests/control_p8 @@ -1,12 +1,12 @@ ############################################################################### # -# Global control test GFSv16 atmosphere only at C96L127, P7 configuration +# Global control test GFSv16 atmosphere only at C96L127, P8 configuration # ############################################################################### export TEST_DESCR="Compare global control results with previous trunk version" -export CNTL_DIR=control_p7 +export CNTL_DIR=control_p8 export LIST_FILES="sfcf000.nc \ sfcf021.nc \ @@ -136,6 +136,9 @@ export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" export LANDICE=".false." export FSICL=99999 +# P8 RRTMGP +export DO_RRTMGP=.true. + #required for NML.IN sharing export USE_CICE_ALB=.false. export MIN_SEAICE=0.15 @@ -143,7 +146,7 @@ export FRAC_GRID=.true. export MOM6_RESTART_SETTING=n export FV3_RUN=control_run.IN -export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1 +export CCPP_SUITE=FV3_GFS_v16_p8 export NEW_DIAGTABLE=diag_table_gfsv16_merra2 -# use same namelist for standalone,coupled P7 +# use same namelist for standalone,coupled export INPUT_NML=cpld_control.nml.IN diff --git a/tests/tests/control_restart_p7 b/tests/tests/control_restart_p8 similarity index 96% rename from tests/tests/control_restart_p7 rename to tests/tests/control_restart_p8 index 6c01bc3dc7..2d2ac42210 100644 --- a/tests/tests/control_restart_p7 +++ b/tests/tests/control_restart_p8 @@ -1,12 +1,12 @@ ############################################################################### # -# Global control restart test GFSv16 atmosphere only at C96L127, P7 configuration +# Global control restart test GFSv16 atmosphere only at C96L127, P8 configuration # ############################################################################### -export TEST_DESCR="Compare global restart results with control_p7 test" +export TEST_DESCR="Compare global restart results with control_p8 test" -export CNTL_DIR=control_p7 +export CNTL_DIR=control_p8 export LIST_FILES="sfcf024.nc \ atmf024.nc \ @@ -134,6 +134,9 @@ export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" export LANDICE=".false." export FSICL=99999 +# P8 RRTMGP +export DO_RRTMGP=.true. + #required for NML.IN sharing export USE_CICE_ALB=.false. export MIN_SEAICE=0.15 @@ -141,7 +144,7 @@ export FRAC_GRID=.true. export MOM6_RESTART_SETTING=n export FV3_RUN=control_run.IN -export CCPP_SUITE=FV3_GFS_v16_nsstNoahmpUGWPv1 +export CCPP_SUITE=FV3_GFS_v16_p8 export NEW_DIAGTABLE=diag_table_gfsv16_merra2 -# use same namelist for standalone,coupled P7 +# use same namelist for standalone,coupled export INPUT_NML=cpld_control.nml.IN diff --git a/tests/tests/cpld_2threads_p7 b/tests/tests/cpld_2threads_p8 similarity index 98% rename from tests/tests/cpld_2threads_p7 rename to tests/tests/cpld_2threads_p8 index 5270b26255..addc411bdf 100644 --- a/tests/tests/cpld_2threads_p7 +++ b/tests/tests/cpld_2threads_p8 @@ -1,10 +1,10 @@ # -# cpld_2threads P7 test +# cpld_2threads P8 test # export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - 2 threads" -export CNTL_DIR="cpld_control_p7" +export CNTL_DIR="cpld_control_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \ diff --git a/tests/tests/cpld_bmark_mpi_p7 b/tests/tests/cpld_bmark_mpi_p8 similarity index 97% rename from tests/tests/cpld_bmark_mpi_p7 rename to tests/tests/cpld_bmark_mpi_p8 index dfdbe333be..7004842f74 100644 --- a/tests/tests/cpld_bmark_mpi_p7 +++ b/tests/tests/cpld_bmark_mpi_p8 @@ -1,9 +1,9 @@ # -# cpld_bmark_p7 test WW3 mpi +# cpld_bmark_p8 test WW3 mpi # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P7 test - WW3 MPI" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P8 test - WW3 MPI" -export CNTL_DIR="cpld_bmark_p7" +export CNTL_DIR="cpld_bmark_p8" export LIST_FILES="sfcf006.nc \ atmf006.nc \ diff --git a/tests/tests/cpld_bmark_p7 b/tests/tests/cpld_bmark_p7 index 44a6e34aaf..62fcdf3269 100644 --- a/tests/tests/cpld_bmark_p7 +++ b/tests/tests/cpld_bmark_p7 @@ -141,4 +141,6 @@ export RST_2_BEG=$RUN_BEG export RST_END=$RUN_END export RST_2_END=$RUN_END +export DO_RRTMGP=.false. +export CCPP_SUITE=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_bmark_p7_35d b/tests/tests/cpld_bmark_p7_35d index 8a1496adfc..5d5bd477a5 100644 --- a/tests/tests/cpld_bmark_p7_35d +++ b/tests/tests/cpld_bmark_p7_35d @@ -104,4 +104,6 @@ export RST_2_BEG=$RUN_BEG export RST_END=$RUN_END export RST_2_END=$RUN_END +export DO_RRTMGP=.false. +export CCPP_SUITE=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8 new file mode 100644 index 0000000000..b7efbc9734 --- /dev/null +++ b/tests/tests/cpld_bmark_p8 @@ -0,0 +1,144 @@ +# +# cpld_bmark_p8 test +# +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P8 test" + +export CNTL_DIR="cpld_bmark_p8" + +export LIST_FILES="sfcf006.nc \ + atmf006.nc \ + 20130401.060000.out_grd.gwes_30m \ + 20130401.060000.out_pnt.points \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc \ + RESTART/MOM.res.nc \ + RESTART/MOM.res_1.nc \ + RESTART/MOM.res_2.nc \ + RESTART/MOM.res_3.nc \ + RESTART/iced.2013-04-01-21600.nc \ + RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc" + +export_fv3 +export_cpl + +export SYEAR=2013 +export SMONTH=04 +export SDAY=01 +export SHOUR=00 +export SECS=`expr $SHOUR \* 3600` +export BMIC=.true. + +export DAYS=0.25 +export FHMAX=6 +export RESTART_N=`expr ${FHMAX} - ${FHROT}` +export RESTART_INTERVAL="${RESTART_N} -1" + +export TASKS=$TASKS_cpl_bmrk +export TPN=$TPN_cpl_bmrk +export INPES=$INPES_cpl_bmrk +export JNPES=$JNPES_cpl_bmrk +export THRD=$THRD_cpl_bmrk +export WRTTASK_PER_GROUP=$WPG_cpl_bmrk + +export med_petlist_bounds=$MPB_cpl_bmrk +export atm_petlist_bounds=$APB_cpl_bmrk +export ocn_petlist_bounds=$OPB_cpl_bmrk +export ice_petlist_bounds=$IPB_cpl_bmrk +export wav_petlist_bounds=$WPB_cpl_bmrk + +# atm/ocn/ice resolution +export ATMRES=C384 +export NPX=385 +export NPY=385 +export IMO=1536 +export JMO=768 +export OUTPUT_GRID="'gaussian_grid'" + +export OCNRES=025 +export ICERES=0.25 +export NX_GLB=1440 +export NY_GLB=1080 +export NPROC_ICE=$NPROC_ICE_cpl_bmrk +export np2=`expr $NPROC_ICE / 2` +export BLCKX=`expr $NX_GLB / $np2` +export BLCKY=`expr $NY_GLB / 2` + +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + +# set component and coupling timesteps +export DT_ATMOS=300 +export DT_CICE=${DT_ATMOS} +export DT_DYNAM_MOM6=900 +export DT_THERM_MOM6=1800 + +# nems.configure +export NEMS_CONFIGURE=nems.configure.cpld_wave.IN +export coupling_interval_slow_sec=${DT_THERM_MOM6} +export coupling_interval_fast_sec=${DT_ATMOS} + +# resolution dependent files +export MOM_INPUT=MOM_input_template_${OCNRES} +export MESHOCN_ICE=mesh.mx${OCNRES}.nc +export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc +export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc +export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc +export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc + +export FNALBC="'C384.snowfree_albedo.tileX.nc'" +export FNALBC2="'C384.facsf.tileX.nc'" +export FNTG3C="'C384.substrate_temperature.tileX.nc'" +export FNVEGC="'C384.vegetation_greenness.tileX.nc'" +export FNVETC="'C384.vegetation_type.tileX.nc'" +export FNSOTC="'C384.soil_type.tileX.nc'" +export FNVMNC="'C384.vegetation_greenness.tileX.nc'" +export FNVMXC="'C384.vegetation_greenness.tileX.nc'" +export FNSLPC="'C384.slope_type.tileX.nc'" +export FNABSC="'C384.maximum_snow_albedo.tileX.nc'" + +export MOM6_RIVER_RUNOFF=True +export MOM6_RESTART_SETTING=r + +export WW3GRIDLINE="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 1 1 0.00 1.00 F" +export WW3RSTDTHR=${FHMAX} +export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))" +export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000" +export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000" +export OUT_BEG=$RUN_BEG +export OUT_END=$RUN_END +export RST_BEG=$RUN_BEG +export RST_2_BEG=$RUN_BEG +export RST_END=$RUN_END +export RST_2_END=$RUN_END + +export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d new file mode 100644 index 0000000000..f36d51c626 --- /dev/null +++ b/tests/tests/cpld_bmark_p8_35d @@ -0,0 +1,107 @@ +# +# cpld_bmark_p8 35 day test +# +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P8 35 day test" + +export CNTL_DIR="cpld_bmark_p8" + +export LIST_FILES="" + +export_fv3 +export_cpl + +export SYEAR +export SMONTH +export SDAY=01 +export SHOUR=00 +export SECS=`expr $SHOUR \* 3600` +export BMIC=.true. + +export DAYS=35 +export FHMAX=840 +export RESTART_N=`expr ${FHMAX} - ${FHROT}` +export WLCLK=480 + +export TASKS=1700 +export TPN=$TPN_cpl_thrd +export INPES=12 +export JNPES=16 +export THRD=2 +export WRTTASK_PER_GROUP=88 + +export med_petlist_bounds="0 299" +export atm_petlist_bounds="0 1239" +export ocn_petlist_bounds="1240 1459" +export ice_petlist_bounds="1460 1539" +export wav_petlist_bounds="1540 1699" + +# atm/ocn/ice resolution +export ATMRES=C384 +export NPX=385 +export NPY=385 +export IMO=1536 +export JMO=768 +export OUTPUT_GRID="'gaussian_grid'" + +export OCNRES=025 +export ICERES=0.25 +export NX_GLB=1440 +export NY_GLB=1080 +export NPROC_ICE=80 +export np2=`expr $NPROC_ICE / 2` +export BLCKX=`expr $NX_GLB / $np2` +export BLCKY=`expr $NY_GLB / 2` + +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + +# set component and coupling timesteps +export DT_ATMOS=300 +export DT_CICE=${DT_ATMOS} +export DT_DYNAM_MOM6=900 +export DT_THERM_MOM6=1800 + +# nems.configure +export NEMS_CONFIGURE=nems.configure.cpld_wave.IN +export coupling_interval_slow_sec=${DT_THERM_MOM6} +export coupling_interval_fast_sec=${DT_ATMOS} + +export CPLWAV=.true. +export CPLWAV2ATM=.true. + +# resolution dependent files +export MOM_INPUT=MOM_input_template_${OCNRES} +export MESHOCN_ICE=mesh.mx${OCNRES}.nc +export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc +export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc +export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc +export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc + +export FNALBC="'C384.snowfree_albedo.tileX.nc'" +export FNALBC2="'C384.facsf.tileX.nc'" +export FNTG3C="'C384.substrate_temperature.tileX.nc'" +export FNVEGC="'C384.vegetation_greenness.tileX.nc'" +export FNVETC="'C384.vegetation_type.tileX.nc'" +export FNSOTC="'C384.soil_type.tileX.nc'" +export FNVMNC="'C384.vegetation_greenness.tileX.nc'" +export FNVMXC="'C384.vegetation_greenness.tileX.nc'" +export FNSLPC="'C384.slope_type.tileX.nc'" +export FNABSC="'C384.maximum_snow_albedo.tileX.nc'" + +export MOM6_USE_WAVES=True +export MOM6_RIVER_RUNOFF=True +export MOM6_RESTART_SETTING=r + +export WW3GRIDLINE="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 1 1 0.00 1.00 F" +export WW3RSTDTHR=${FHMAX} +export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))" +export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000" +export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000" +export OUT_BEG=$RUN_BEG +export OUT_END=$RUN_END +export RST_BEG=$RUN_BEG +export RST_2_BEG=$RUN_BEG +export RST_END=$RUN_END +export RST_2_END=$RUN_END + +export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_c192_p7 b/tests/tests/cpld_control_c192_p8 similarity index 97% rename from tests/tests/cpld_control_c192_p7 rename to tests/tests/cpld_control_c192_p8 index c378dee3cc..0bea8ffb32 100644 --- a/tests/tests/cpld_control_c192_p7 +++ b/tests/tests/cpld_control_c192_p8 @@ -1,9 +1,9 @@ # -# cpld_control_c192_p7 test +# cpld_control_c192_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - P7 test" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - P8 test" -export CNTL_DIR="cpld_control_c192_p7" +export CNTL_DIR="cpld_control_c192_p8" export LIST_FILES="sfcf036.tile1.nc \ sfcf036.tile2.nc \ diff --git a/tests/tests/cpld_control_c384_p7 b/tests/tests/cpld_control_c384_p8 similarity index 97% rename from tests/tests/cpld_control_c384_p7 rename to tests/tests/cpld_control_c384_p8 index 784e9140c5..4703f9c057 100644 --- a/tests/tests/cpld_control_c384_p7 +++ b/tests/tests/cpld_control_c384_p8 @@ -1,9 +1,9 @@ # -# cpld_control_c384_p7 test +# cpld_control_c384_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P7 test " +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 test " -export CNTL_DIR="cpld_control_c384_p7" +export CNTL_DIR="cpld_control_c384_p8" export LIST_FILES="sfcf006.nc \ atmf006.nc \ diff --git a/tests/tests/cpld_control_c96_p7 b/tests/tests/cpld_control_c96_p8 similarity index 97% rename from tests/tests/cpld_control_c96_p7 rename to tests/tests/cpld_control_c96_p8 index 28898b6307..82a2e3e9ad 100644 --- a/tests/tests/cpld_control_c96_p7 +++ b/tests/tests/cpld_control_c96_p8 @@ -1,10 +1,10 @@ # -# cpld_control C96 P7 test +# cpld_control C96 P8 test # export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100" -export CNTL_DIR="cpld_control_c96_p7" +export CNTL_DIR="cpld_control_c96_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \ diff --git a/tests/tests/cpld_control_p7 b/tests/tests/cpld_control_p8 similarity index 97% rename from tests/tests/cpld_control_p7 rename to tests/tests/cpld_control_p8 index b915b5cad0..4ed73d3b91 100644 --- a/tests/tests/cpld_control_p7 +++ b/tests/tests/cpld_control_p8 @@ -1,10 +1,10 @@ # -# cpld_control P7 test +# cpld_control P8 test # export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100" -export CNTL_DIR="cpld_control_p7" +export CNTL_DIR="cpld_control_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \ diff --git a/tests/tests/cpld_debug_p7 b/tests/tests/cpld_debug_p8 similarity index 97% rename from tests/tests/cpld_debug_p7 rename to tests/tests/cpld_debug_p8 index 5ab5036870..323c148f7e 100644 --- a/tests/tests/cpld_debug_p7 +++ b/tests/tests/cpld_debug_p8 @@ -1,10 +1,10 @@ # -# cpld_debug_p7 test +# cpld_debug_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P7 debug" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P8 debug" -export CNTL_DIR="cpld_debug_p7" +export CNTL_DIR="cpld_debug_p8" export LIST_FILES="sfcf006.tile1.nc \ sfcf006.tile2.nc \ diff --git a/tests/tests/cpld_decomp_p7 b/tests/tests/cpld_decomp_p8 similarity index 98% rename from tests/tests/cpld_decomp_p7 rename to tests/tests/cpld_decomp_p8 index d2e1ba4209..7b762239fd 100644 --- a/tests/tests/cpld_decomp_p7 +++ b/tests/tests/cpld_decomp_p8 @@ -1,10 +1,10 @@ # -# cpld_decomp P7 test +# cpld_decomp P8 test # export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - decomp test" -export CNTL_DIR="cpld_control_p7" +export CNTL_DIR="cpld_control_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \ diff --git a/tests/tests/cpld_mpi_p7 b/tests/tests/cpld_mpi_p8 similarity index 98% rename from tests/tests/cpld_mpi_p7 rename to tests/tests/cpld_mpi_p8 index 44b551c694..0df728fb55 100644 --- a/tests/tests/cpld_mpi_p7 +++ b/tests/tests/cpld_mpi_p8 @@ -1,10 +1,10 @@ # -# cpld_mpi P7 test +# cpld_mpi P8 test # export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - change mpi task test" -export CNTL_DIR="cpld_control_p7" +export CNTL_DIR="cpld_control_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \ diff --git a/tests/tests/cpld_restart_c192_p7 b/tests/tests/cpld_restart_c192_p8 similarity index 97% rename from tests/tests/cpld_restart_c192_p7 rename to tests/tests/cpld_restart_c192_p8 index 75165ef832..e8284898ab 100644 --- a/tests/tests/cpld_restart_c192_p7 +++ b/tests/tests/cpld_restart_c192_p8 @@ -1,9 +1,9 @@ # -# cpld_restart_c192_p7 test +# cpld_restart_c192_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 24h P7 restart test" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 24h P8 restart test" -export CNTL_DIR="cpld_control_c192_p7" +export CNTL_DIR="cpld_control_c192_p8" export LIST_FILES="sfcf036.tile1.nc \ sfcf036.tile2.nc \ diff --git a/tests/tests/cpld_restart_c384_p7 b/tests/tests/cpld_restart_c384_p8 similarity index 97% rename from tests/tests/cpld_restart_c384_p7 rename to tests/tests/cpld_restart_c384_p8 index 206e50a980..b1bb8406c5 100644 --- a/tests/tests/cpld_restart_c384_p7 +++ b/tests/tests/cpld_restart_c384_p8 @@ -1,9 +1,9 @@ # -# cpld_restart_c384_p7 test +# cpld_restart_c384_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P7 restart" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 restart" -export CNTL_DIR="cpld_control_c384_p7" +export CNTL_DIR="cpld_control_c384_p8" export LIST_FILES="sfcf006.nc \ atmf006.nc \ diff --git a/tests/tests/cpld_restart_c96_p7 b/tests/tests/cpld_restart_c96_p8 similarity index 97% rename from tests/tests/cpld_restart_c96_p7 rename to tests/tests/cpld_restart_c96_p8 index 96b4e54b3f..a443d844e4 100644 --- a/tests/tests/cpld_restart_c96_p7 +++ b/tests/tests/cpld_restart_c96_p8 @@ -1,10 +1,10 @@ # -# cpld_restart_c96_p7 test +# cpld_restart_c96_p8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P7 restart" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P8 restart" -export CNTL_DIR="cpld_control_c96_p7" +export CNTL_DIR="cpld_control_c96_p8" export LIST_FILES="sfcf024.tile1.nc \ sfcf024.tile2.nc \