From e1f3aff1ccd5e04942f473eae7eb127687a58070 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Thu, 5 Oct 2023 14:39:01 -0500 Subject: [PATCH 1/4] updates for wave for hr3 --- tests/rt.conf | 9 ++ tests/tests/cpld_control_gfsv17_ugwpv1_pdlib | 127 +++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 tests/tests/cpld_control_gfsv17_ugwpv1_pdlib diff --git a/tests/rt.conf b/tests/rt.conf index 75686f2db6..4168373763 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -26,6 +26,15 @@ RUN | cpld_control_p8_mixedmode | - noaacloud RUN | cpld_control_gfsv17 | | baseline | RUN | cpld_control_gfsv17_ugwpv1 | | baseline | +#GFS +COMPILE | s2swa_32bit_pdlib | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | + hera orion cheyenne wcoss2 | fv3 | +RUN | cpld_control_gfsv17_ugwpv1_pdlib | + hera orion cheyenne wcoss2 | baseline | +RUN | cpld_restart_gfsv17_ugwpv1_pdlib | + hera orion cheyenne wcoss2 | | cpld_control_gfsv17_ugwpv1_pdlib +RUN | cpld_mpi_gfsv17_ugwpv1_pdlib | + hera orion cheyenne wcoss2 | | cpld_control_gfsv17_ugwpv1_pdlib + +COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 | fv3 | +RUN | cpld_debug_gfsv17_ugwpv1_pdlib | + hera orion cheyenne wcoss2 | baseline | + COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 | RUN | cpld_control_p8 | - noaacloud | baseline | RUN | cpld_restart_p8 | - noaacloud | | cpld_control_p8 diff --git a/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib new file mode 100644 index 0000000000..876990f853 --- /dev/null +++ b/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib @@ -0,0 +1,127 @@ +# +# cpld_control GFSv17 with UGWPv1 test, i.e., GSL orographic drag + +# version 1 non-stationary GWD +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - unst WW3" + +export CNTL_DIR="cpld_control_gfsv17_ugwpv1_pdlib" + +export LIST_FILES="sfcf021.tile1.nc \ + sfcf021.tile2.nc \ + sfcf021.tile3.nc \ + sfcf021.tile4.nc \ + sfcf021.tile5.nc \ + sfcf021.tile6.nc \ + atmf021.tile1.nc \ + atmf021.tile2.nc \ + atmf021.tile3.nc \ + atmf021.tile4.nc \ + atmf021.tile5.nc \ + atmf021.tile6.nc \ + sfcf024.tile1.nc \ + sfcf024.tile2.nc \ + sfcf024.tile3.nc \ + sfcf024.tile4.nc \ + sfcf024.tile5.nc \ + sfcf024.tile6.nc \ + atmf024.tile1.nc \ + atmf024.tile2.nc \ + atmf024.tile3.nc \ + atmf024.tile4.nc \ + atmf024.tile5.nc \ + atmf024.tile6.nc \ + RESTART/20210323.060000.coupler.res \ + RESTART/20210323.060000.fv_core.res.nc \ + RESTART/20210323.060000.fv_core.res.tile1.nc \ + RESTART/20210323.060000.fv_core.res.tile2.nc \ + RESTART/20210323.060000.fv_core.res.tile3.nc \ + RESTART/20210323.060000.fv_core.res.tile4.nc \ + RESTART/20210323.060000.fv_core.res.tile5.nc \ + RESTART/20210323.060000.fv_core.res.tile6.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \ + RESTART/20210323.060000.fv_tracer.res.tile1.nc \ + RESTART/20210323.060000.fv_tracer.res.tile2.nc \ + RESTART/20210323.060000.fv_tracer.res.tile3.nc \ + RESTART/20210323.060000.fv_tracer.res.tile4.nc \ + RESTART/20210323.060000.fv_tracer.res.tile5.nc \ + RESTART/20210323.060000.fv_tracer.res.tile6.nc \ + RESTART/20210323.060000.phy_data.tile1.nc \ + RESTART/20210323.060000.phy_data.tile2.nc \ + RESTART/20210323.060000.phy_data.tile3.nc \ + RESTART/20210323.060000.phy_data.tile4.nc \ + RESTART/20210323.060000.phy_data.tile5.nc \ + RESTART/20210323.060000.phy_data.tile6.nc \ + RESTART/20210323.060000.sfc_data.tile1.nc \ + RESTART/20210323.060000.sfc_data.tile2.nc \ + RESTART/20210323.060000.sfc_data.tile3.nc \ + RESTART/20210323.060000.sfc_data.tile4.nc \ + RESTART/20210323.060000.sfc_data.tile5.nc \ + RESTART/20210323.060000.sfc_data.tile6.nc \ + RESTART/20210323.060000.MOM.res.nc \ + RESTART/iced.2021-03-23-21600.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ + 20210323.060000.out_pnt.ww3 \ + 20210323.060000.out_grd.ww3 " + +export_fv3 +export_cpl + +export CPLCHM=.false. +export DNATS=0 + +export RESTART_N=12 +export RESTART_INTERVAL="${RESTART_N} -1" +export OUTPUT_FH='0 21 24' + +export INPES=$INPES_cpl_unstr +export JNPES=$JNPES_cpl_unstr +export WRTTASK_PER_GROUP=$(( WPG_cpl_unstr * THRD_cpl_unstr )) + +OCN_tasks=$OCN_tasks_cpl_unstr +ICE_tasks=$ICE_tasks_cpl_unstr +WAV_tasks=$WAV_tasks_cpl_unstr + +export atm_omp_num_threads=$THRD_cpl_unstr +export med_omp_num_threads=$atm_omp_num_threads + +# P8 UGWP1 +export GWD_OPT=2 +export CDMBWD=20.0,2.5,1.0,1.0 +export DO_UGWP_V1=.true. +export KNOB_UGWP_VERSION=1 +export KNOB_UGWP_NSLOPE=1 +export DO_UGWP_V0=.false. +export DO_GSL_DRAG_LS_BL=.true. +export DO_GSL_DRAG_SS=.true. +export DO_GSL_DRAG_TOFD=.true. +export DO_UGWP_V1_OROG_ONLY=.false. +export DO_UGWP_V0_NST_ONLY=.false. +export LDIAG_UGWP=.false. + +export TOPOEDITS=ufs.topo_edits_011818.nc +export MOM6_ALLOW_LANDMASK_CHANGES=True +export eps_imesh=2.5e-1 + +export WAVDOMAIN=global_270k +export MESH_WAV=mesh.${WAVDOMAIN}.nc +export MODDEF_WAV=mod_def.exp.${WAVDOMAIN} + +export FV3_RUN=cpld_control_run.IN +export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma +export DIAG_TABLE=diag_table_cpld_template +export INPUT_NML=cpld_control_ugwpv1.nml.IN +export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN + +#GFSv17 settings +export PROGSIGMA=.true. + +if [[ $MACHINE_ID = cheyenne ]]; then + TPN=18 +fi From d165db61ef149fac10f130e26f81e67ba3bf2404 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Thu, 5 Oct 2023 15:00:17 -0500 Subject: [PATCH 2/4] update rest of set of pdlib tests --- tests/tests/cpld_control_gfsv17_ugwpv1_pdlib | 4 + tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib | 123 +++++++++++++++++ tests/tests/cpld_mpi_gfsv17_ugwpv1_pdlib | 136 ++++++++++++++++++ tests/tests/cpld_restart_gfsv17_ugwpv1_pdlib | 137 +++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100644 tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib create mode 100644 tests/tests/cpld_mpi_gfsv17_ugwpv1_pdlib create mode 100644 tests/tests/cpld_restart_gfsv17_ugwpv1_pdlib diff --git a/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib index 876990f853..881872cd1b 100644 --- a/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib +++ b/tests/tests/cpld_control_gfsv17_ugwpv1_pdlib @@ -125,3 +125,7 @@ export PROGSIGMA=.true. if [[ $MACHINE_ID = cheyenne ]]; then TPN=18 fi + +if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then + WLCLK=40 +fi diff --git a/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib new file mode 100644 index 0000000000..a10c786ae9 --- /dev/null +++ b/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib @@ -0,0 +1,123 @@ +# +# cpld_debug unstrWW3 PDLIB P8 test +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system -C96MX100 unstr WW3 PDLIB - P8 debug" + +export CNTL_DIR="cpld_debug_pdlib_p8" + +export LIST_FILES="sfcf003.tile1.nc \ + sfcf003.tile2.nc \ + sfcf003.tile3.nc \ + sfcf003.tile4.nc \ + sfcf003.tile5.nc \ + sfcf003.tile6.nc \ + atmf003.tile1.nc \ + atmf003.tile2.nc \ + atmf003.tile3.nc \ + atmf003.tile4.nc \ + atmf003.tile5.nc \ + atmf003.tile6.nc \ + RESTART/20210322.090000.coupler.res \ + RESTART/20210322.090000.fv_core.res.nc \ + RESTART/20210322.090000.fv_core.res.tile1.nc \ + RESTART/20210322.090000.fv_core.res.tile2.nc \ + RESTART/20210322.090000.fv_core.res.tile3.nc \ + RESTART/20210322.090000.fv_core.res.tile4.nc \ + RESTART/20210322.090000.fv_core.res.tile5.nc \ + RESTART/20210322.090000.fv_core.res.tile6.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile1.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile2.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile3.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile4.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile5.nc \ + RESTART/20210322.090000.fv_srf_wnd.res.tile6.nc \ + RESTART/20210322.090000.fv_tracer.res.tile1.nc \ + RESTART/20210322.090000.fv_tracer.res.tile2.nc \ + RESTART/20210322.090000.fv_tracer.res.tile3.nc \ + RESTART/20210322.090000.fv_tracer.res.tile4.nc \ + RESTART/20210322.090000.fv_tracer.res.tile5.nc \ + RESTART/20210322.090000.fv_tracer.res.tile6.nc \ + RESTART/20210322.090000.phy_data.tile1.nc \ + RESTART/20210322.090000.phy_data.tile2.nc \ + RESTART/20210322.090000.phy_data.tile3.nc \ + RESTART/20210322.090000.phy_data.tile4.nc \ + RESTART/20210322.090000.phy_data.tile5.nc \ + RESTART/20210322.090000.phy_data.tile6.nc \ + RESTART/20210322.090000.sfc_data.tile1.nc \ + RESTART/20210322.090000.sfc_data.tile2.nc \ + RESTART/20210322.090000.sfc_data.tile3.nc \ + RESTART/20210322.090000.sfc_data.tile4.nc \ + RESTART/20210322.090000.sfc_data.tile5.nc \ + RESTART/20210322.090000.sfc_data.tile6.nc \ + RESTART/20210322.090000.MOM.res.nc \ + RESTART/iced.2021-03-22-32400.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \ + 20210322.090000.out_pnt.ww3 \ + 20210322.090000.out_grd.ww3 " + +export_fv3 +export_cpl + +export FHMAX=3 +export DAYS=0.125 + +export RESTART_N=${FHMAX} +export OUTPUT_FH="3 -1" + +export INPES=$INPES_cpl_unstr +export JNPES=$JNPES_cpl_unstr +export WRTTASK_PER_GROUP=$(( WPG_cpl_unstr * THRD_cpl_unstr )) + +OCN_tasks=$OCN_tasks_cpl_unstr +ICE_tasks=$ICE_tasks_cpl_unstr +WAV_tasks=$WAV_tasks_cpl_unstr +# bump resources for debug test +WAV_tasks="$(($WAV_tasks_cpl_unstr + 18))" + +export atm_omp_num_threads=$THRD_cpl_unstr +export med_omp_num_threads=$atm_omp_num_threads + +export CPLCHM=.false. +export DNATS=0 +export TOPOEDITS=ufs.topo_edits_011818.nc +export MOM6_ALLOW_LANDMASK_CHANGES=True +export eps_imesh=2.5e-1 +export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE` + +export GWD_OPT=2 +export CDMBWD=20.0,2.5,1.0,1.0 +export DO_UGWP_V1=.true. +export KNOB_UGWP_VERSION=1 +export KNOB_UGWP_NSLOPE=1 +export DO_UGWP_V0=.false. +export DO_GSL_DRAG_LS_BL=.true. +export DO_GSL_DRAG_SS=.true. +export DO_GSL_DRAG_TOFD=.true. +export DO_UGWP_V1_OROG_ONLY=.false. +export DO_UGWP_V0_NST_ONLY=.false. +export LDIAG_UGWP=.false. + +#GFSv17 settings +export PROGSIGMA=.true. + +export WAVDOMAIN=global_270k +export MESH_WAV=mesh.${WAVDOMAIN}.nc +export MODDEF_WAV=mod_def.exp.${WAVDOMAIN} + +export FV3_RUN=cpld_control_run.IN +export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma +export DIAG_TABLE=diag_table_cpld_template +export INPUT_NML=cpld_control_ugwpv1.nml.IN +export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN + +export FV3_RUN=cpld_control_run.IN + +if [[ $MACHINE_ID = cheyenne ]]; then + TPN=18 +fi + +if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then + WLCLK=40 +fi diff --git a/tests/tests/cpld_mpi_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_mpi_gfsv17_ugwpv1_pdlib new file mode 100644 index 0000000000..60ddbfe4e0 --- /dev/null +++ b/tests/tests/cpld_mpi_gfsv17_ugwpv1_pdlib @@ -0,0 +1,136 @@ +# +# cpld_control GFSv17 with UGWPv1 test, i.e., GSL orographic drag + +# version 1 non-stationary GWD +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - unst WW3" + +export CNTL_DIR="cpld_control_gfsv17_ugwpv1_pdlib" + +export LIST_FILES="sfcf021.tile1.nc \ + sfcf021.tile2.nc \ + sfcf021.tile3.nc \ + sfcf021.tile4.nc \ + sfcf021.tile5.nc \ + sfcf021.tile6.nc \ + atmf021.tile1.nc \ + atmf021.tile2.nc \ + atmf021.tile3.nc \ + atmf021.tile4.nc \ + atmf021.tile5.nc \ + atmf021.tile6.nc \ + sfcf024.tile1.nc \ + sfcf024.tile2.nc \ + sfcf024.tile3.nc \ + sfcf024.tile4.nc \ + sfcf024.tile5.nc \ + sfcf024.tile6.nc \ + atmf024.tile1.nc \ + atmf024.tile2.nc \ + atmf024.tile3.nc \ + atmf024.tile4.nc \ + atmf024.tile5.nc \ + atmf024.tile6.nc \ + RESTART/20210323.060000.coupler.res \ + RESTART/20210323.060000.fv_core.res.nc \ + RESTART/20210323.060000.fv_core.res.tile1.nc \ + RESTART/20210323.060000.fv_core.res.tile2.nc \ + RESTART/20210323.060000.fv_core.res.tile3.nc \ + RESTART/20210323.060000.fv_core.res.tile4.nc \ + RESTART/20210323.060000.fv_core.res.tile5.nc \ + RESTART/20210323.060000.fv_core.res.tile6.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \ + RESTART/20210323.060000.fv_tracer.res.tile1.nc \ + RESTART/20210323.060000.fv_tracer.res.tile2.nc \ + RESTART/20210323.060000.fv_tracer.res.tile3.nc \ + RESTART/20210323.060000.fv_tracer.res.tile4.nc \ + RESTART/20210323.060000.fv_tracer.res.tile5.nc \ + RESTART/20210323.060000.fv_tracer.res.tile6.nc \ + RESTART/20210323.060000.phy_data.tile1.nc \ + RESTART/20210323.060000.phy_data.tile2.nc \ + RESTART/20210323.060000.phy_data.tile3.nc \ + RESTART/20210323.060000.phy_data.tile4.nc \ + RESTART/20210323.060000.phy_data.tile5.nc \ + RESTART/20210323.060000.phy_data.tile6.nc \ + RESTART/20210323.060000.sfc_data.tile1.nc \ + RESTART/20210323.060000.sfc_data.tile2.nc \ + RESTART/20210323.060000.sfc_data.tile3.nc \ + RESTART/20210323.060000.sfc_data.tile4.nc \ + RESTART/20210323.060000.sfc_data.tile5.nc \ + RESTART/20210323.060000.sfc_data.tile6.nc \ + RESTART/20210323.060000.MOM.res.nc \ + RESTART/iced.2021-03-23-21600.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ + 20210323.060000.out_pnt.ww3 \ + 20210323.060000.out_grd.ww3 " + +export_fv3 +export_cpl + +export CPLCHM=.false. +export DNATS=0 + +export RESTART_N=12 +export RESTART_INTERVAL="${RESTART_N} -1" +export OUTPUT_FH='0 21 24' + + +export INPES=$INPES_cpl_unstr_mpi +export JNPES=$JNPES_cpl_unstr_mpi +export atm_omp_num_threads=$THRD_cpl_unstr_mpi +export WRTTASK_PER_GROUP=$(( WPG_cpl_unstr_mpi * THRD_cpl_unstr_mpi )) + +OCN_tasks=$OCN_tasks_cpl_unstr_mpi +ICE_tasks=$ICE_tasks_cpl_unstr_mpi +WAV_tasks=$WAV_tasks_cpl_unstr_mpi + +export NPROC_ICE=$ICE_tasks +export np2=`expr $NPROC_ICE / 2` +export BLCKX=`expr $NX_GLB / $np2` +export BLCKY=`expr $NY_GLB / 2` + + + +export atm_omp_num_threads=$THRD_cpl_unstr +export med_omp_num_threads=$atm_omp_num_threads + +# P8 UGWP1 +export GWD_OPT=2 +export CDMBWD=20.0,2.5,1.0,1.0 +export DO_UGWP_V1=.true. +export KNOB_UGWP_VERSION=1 +export KNOB_UGWP_NSLOPE=1 +export DO_UGWP_V0=.false. +export DO_GSL_DRAG_LS_BL=.true. +export DO_GSL_DRAG_SS=.true. +export DO_GSL_DRAG_TOFD=.true. +export DO_UGWP_V1_OROG_ONLY=.false. +export DO_UGWP_V0_NST_ONLY=.false. +export LDIAG_UGWP=.false. + +export TOPOEDITS=ufs.topo_edits_011818.nc +export MOM6_ALLOW_LANDMASK_CHANGES=True +export eps_imesh=2.5e-1 + +export WAVDOMAIN=global_270k +export MESH_WAV=mesh.${WAVDOMAIN}.nc +export MODDEF_WAV=mod_def.exp.${WAVDOMAIN} + +export FV3_RUN=cpld_control_run.IN +export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma +export DIAG_TABLE=diag_table_cpld_template +export INPUT_NML=cpld_control_ugwpv1.nml.IN +export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN + +#GFSv17 settings +export PROGSIGMA=.true. + +if [[ $MACHINE_ID = cheyenne ]]; then + TPN=18 +fi diff --git a/tests/tests/cpld_restart_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_restart_gfsv17_ugwpv1_pdlib new file mode 100644 index 0000000000..b23fa78b91 --- /dev/null +++ b/tests/tests/cpld_restart_gfsv17_ugwpv1_pdlib @@ -0,0 +1,137 @@ +# +# cpld_control GFSv17 with UGWPv1 test, i.e., GSL orographic drag + +# version 1 non-stationary GWD +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - unst WW3 - Restart " + +export CNTL_DIR="cpld_control_gfsv17_ugwpv1_pdlib" + +export LIST_FILES="sfcf024.tile1.nc \ + sfcf024.tile1.nc \ + sfcf024.tile2.nc \ + sfcf024.tile3.nc \ + sfcf024.tile4.nc \ + sfcf024.tile5.nc \ + sfcf024.tile6.nc \ + atmf024.tile1.nc \ + atmf024.tile2.nc \ + atmf024.tile3.nc \ + atmf024.tile4.nc \ + atmf024.tile5.nc \ + atmf024.tile6.nc \ + RESTART/20210323.060000.coupler.res \ + RESTART/20210323.060000.fv_core.res.nc \ + RESTART/20210323.060000.fv_core.res.tile1.nc \ + RESTART/20210323.060000.fv_core.res.tile2.nc \ + RESTART/20210323.060000.fv_core.res.tile3.nc \ + RESTART/20210323.060000.fv_core.res.tile4.nc \ + RESTART/20210323.060000.fv_core.res.tile5.nc \ + RESTART/20210323.060000.fv_core.res.tile6.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \ + RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \ + RESTART/20210323.060000.fv_tracer.res.tile1.nc \ + RESTART/20210323.060000.fv_tracer.res.tile2.nc \ + RESTART/20210323.060000.fv_tracer.res.tile3.nc \ + RESTART/20210323.060000.fv_tracer.res.tile4.nc \ + RESTART/20210323.060000.fv_tracer.res.tile5.nc \ + RESTART/20210323.060000.fv_tracer.res.tile6.nc \ + RESTART/20210323.060000.phy_data.tile1.nc \ + RESTART/20210323.060000.phy_data.tile2.nc \ + RESTART/20210323.060000.phy_data.tile3.nc \ + RESTART/20210323.060000.phy_data.tile4.nc \ + RESTART/20210323.060000.phy_data.tile5.nc \ + RESTART/20210323.060000.phy_data.tile6.nc \ + RESTART/20210323.060000.sfc_data.tile1.nc \ + RESTART/20210323.060000.sfc_data.tile2.nc \ + RESTART/20210323.060000.sfc_data.tile3.nc \ + RESTART/20210323.060000.sfc_data.tile4.nc \ + RESTART/20210323.060000.sfc_data.tile5.nc \ + RESTART/20210323.060000.sfc_data.tile6.nc \ + RESTART/20210323.060000.MOM.res.nc \ + RESTART/iced.2021-03-23-21600.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ + 20210323.060000.out_pnt.ww3 \ + 20210323.060000.out_grd.ww3 " + +export_fv3 +export_cpl + +export CPLCHM=.false. +export DNATS=0 + +export FHROT=12 +export RESTART_N=$((FHMAX-$FHROT)) + +export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000" +export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))" + +# ATM warm start +export WARM_START=.true. +export MAKE_NH=.false. +export NA_INIT=0 +export EXTERNAL_IC=.false. +export NGGPS_IC=.false. +export MOUNTAIN=.true. + +# ICE warm start +export CICERUNTYPE=continue +export RUNTYPE=continue +export USE_RESTART_TIME=.true. + +# MOM6 warm start +export MOM6_RESTART_SETTING=r + + +export INPES=$INPES_cpl_unstr +export JNPES=$JNPES_cpl_unstr +export WRTTASK_PER_GROUP=$(( WPG_cpl_unstr * THRD_cpl_unstr )) + +OCN_tasks=$OCN_tasks_cpl_unstr +ICE_tasks=$ICE_tasks_cpl_unstr +WAV_tasks=$WAV_tasks_cpl_unstr + +export atm_omp_num_threads=$THRD_cpl_unstr +export med_omp_num_threads=$atm_omp_num_threads + +# P8 UGWP1 +export GWD_OPT=2 +export CDMBWD=20.0,2.5,1.0,1.0 +export DO_UGWP_V1=.true. +export KNOB_UGWP_VERSION=1 +export KNOB_UGWP_NSLOPE=1 +export DO_UGWP_V0=.false. +export DO_GSL_DRAG_LS_BL=.true. +export DO_GSL_DRAG_SS=.true. +export DO_GSL_DRAG_TOFD=.true. +export DO_UGWP_V1_OROG_ONLY=.false. +export DO_UGWP_V0_NST_ONLY=.false. +export LDIAG_UGWP=.false. + +export TOPOEDITS=ufs.topo_edits_011818.nc +export MOM6_ALLOW_LANDMASK_CHANGES=True +export eps_imesh=2.5e-1 +export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE` + +export WAVDOMAIN=global_270k +export MESH_WAV=mesh.${WAVDOMAIN}.nc +export MODDEF_WAV=mod_def.exp.${WAVDOMAIN} + +export FV3_RUN=cpld_control_run.IN +export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma +export DIAG_TABLE=diag_table_cpld_template +export INPUT_NML=cpld_control_ugwpv1.nml.IN +export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN + +#GFSv17 settings +export PROGSIGMA=.true. + +if [[ $MACHINE_ID = cheyenne ]]; then + TPN=18 +fi + From 332596c5f339c0cccb657f2c478551e1ae96e794 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 10 Oct 2023 12:19:39 +0000 Subject: [PATCH 3/4] update debug test to point to it's own baseline --- tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib b/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib index a10c786ae9..3b7e1b6bd0 100644 --- a/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib +++ b/tests/tests/cpld_debug_gfsv17_ugwpv1_pdlib @@ -1,10 +1,10 @@ # -# cpld_debug unstrWW3 PDLIB P8 test +# cpld_debug unstrWW3 PDLIB GFSv17 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system -C96MX100 unstr WW3 PDLIB - P8 debug" +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system -C96MX100 unstr WW3 PDLIB - GFSv17 debug" -export CNTL_DIR="cpld_debug_pdlib_p8" +export CNTL_DIR="cpld_debug_gfsv17_ugwpv1_pdlib" export LIST_FILES="sfcf003.tile1.nc \ sfcf003.tile2.nc \ From 0799cb2eb82ad159df575e30079a59176267472e Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 12 Oct 2023 18:36:15 +0000 Subject: [PATCH 4/4] only keeping one GFSv17 test as requested --- tests/tests/cpld_control_gfsv17 | 96 --------------------- tests/tests/cpld_control_gfsv17_ugwpv1 | 112 ------------------------- 2 files changed, 208 deletions(-) delete mode 100644 tests/tests/cpld_control_gfsv17 delete mode 100644 tests/tests/cpld_control_gfsv17_ugwpv1 diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17 deleted file mode 100644 index af52e8562f..0000000000 --- a/tests/tests/cpld_control_gfsv17 +++ /dev/null @@ -1,96 +0,0 @@ -# -# cpld_control GFSv17 test -# - -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100" - -export CNTL_DIR="cpld_control_gfsv17" - -export LIST_FILES="sfcf021.tile1.nc \ - sfcf021.tile2.nc \ - sfcf021.tile3.nc \ - sfcf021.tile4.nc \ - sfcf021.tile5.nc \ - sfcf021.tile6.nc \ - atmf021.tile1.nc \ - atmf021.tile2.nc \ - atmf021.tile3.nc \ - atmf021.tile4.nc \ - atmf021.tile5.nc \ - atmf021.tile6.nc \ - sfcf024.tile1.nc \ - sfcf024.tile2.nc \ - sfcf024.tile3.nc \ - sfcf024.tile4.nc \ - sfcf024.tile5.nc \ - sfcf024.tile6.nc \ - atmf024.tile1.nc \ - atmf024.tile2.nc \ - atmf024.tile3.nc \ - atmf024.tile4.nc \ - atmf024.tile5.nc \ - atmf024.tile6.nc \ - RESTART/20210323.060000.coupler.res \ - RESTART/20210323.060000.fv_core.res.nc \ - RESTART/20210323.060000.fv_core.res.tile1.nc \ - RESTART/20210323.060000.fv_core.res.tile2.nc \ - RESTART/20210323.060000.fv_core.res.tile3.nc \ - RESTART/20210323.060000.fv_core.res.tile4.nc \ - RESTART/20210323.060000.fv_core.res.tile5.nc \ - RESTART/20210323.060000.fv_core.res.tile6.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \ - RESTART/20210323.060000.fv_tracer.res.tile1.nc \ - RESTART/20210323.060000.fv_tracer.res.tile2.nc \ - RESTART/20210323.060000.fv_tracer.res.tile3.nc \ - RESTART/20210323.060000.fv_tracer.res.tile4.nc \ - RESTART/20210323.060000.fv_tracer.res.tile5.nc \ - RESTART/20210323.060000.fv_tracer.res.tile6.nc \ - RESTART/20210323.060000.phy_data.tile1.nc \ - RESTART/20210323.060000.phy_data.tile2.nc \ - RESTART/20210323.060000.phy_data.tile3.nc \ - RESTART/20210323.060000.phy_data.tile4.nc \ - RESTART/20210323.060000.phy_data.tile5.nc \ - RESTART/20210323.060000.phy_data.tile6.nc \ - RESTART/20210323.060000.sfc_data.tile1.nc \ - RESTART/20210323.060000.sfc_data.tile2.nc \ - RESTART/20210323.060000.sfc_data.tile3.nc \ - RESTART/20210323.060000.sfc_data.tile4.nc \ - RESTART/20210323.060000.sfc_data.tile5.nc \ - RESTART/20210323.060000.sfc_data.tile6.nc \ - RESTART/20210323.060000.MOM.res.nc \ - RESTART/iced.2021-03-23-21600.nc \ - RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ - 20210323.060000.out_pnt.ww3 \ - 20210323.060000.out_grd.ww3 " - -export_fv3 -export_cpl - -export CPLCHM=.false. -export DNATS=0 - -export RESTART_N=12 -export RESTART_INTERVAL="${RESTART_N} -1" -export OUTPUT_FH='0 21 24' - -export TOPOEDITS=ufs.topo_edits_011818.nc -export MOM6_ALLOW_LANDMASK_CHANGES=True -export eps_imesh=2.5e-1 - -export FV3_RUN=cpld_control_run.IN -export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma -export DIAG_TABLE=diag_table_cpld_template -export INPUT_NML=cpld_control.nml.IN -export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN - -#GFSv17 settings -export PROGSIGMA=.true. - -if [[ $MACHINE_ID = cheyenne ]]; then - TPN=18 -fi diff --git a/tests/tests/cpld_control_gfsv17_ugwpv1 b/tests/tests/cpld_control_gfsv17_ugwpv1 deleted file mode 100644 index 28fc98cb30..0000000000 --- a/tests/tests/cpld_control_gfsv17_ugwpv1 +++ /dev/null @@ -1,112 +0,0 @@ -# -# cpld_control GFSv17 with UGWPv1 test, i.e., GSL orographic drag + -# version 1 non-stationary GWD -# - -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100" - -export CNTL_DIR="cpld_control_gfsv17_ugwpv1" - -export LIST_FILES="sfcf021.tile1.nc \ - sfcf021.tile2.nc \ - sfcf021.tile3.nc \ - sfcf021.tile4.nc \ - sfcf021.tile5.nc \ - sfcf021.tile6.nc \ - atmf021.tile1.nc \ - atmf021.tile2.nc \ - atmf021.tile3.nc \ - atmf021.tile4.nc \ - atmf021.tile5.nc \ - atmf021.tile6.nc \ - sfcf024.tile1.nc \ - sfcf024.tile2.nc \ - sfcf024.tile3.nc \ - sfcf024.tile4.nc \ - sfcf024.tile5.nc \ - sfcf024.tile6.nc \ - atmf024.tile1.nc \ - atmf024.tile2.nc \ - atmf024.tile3.nc \ - atmf024.tile4.nc \ - atmf024.tile5.nc \ - atmf024.tile6.nc \ - RESTART/20210323.060000.coupler.res \ - RESTART/20210323.060000.fv_core.res.nc \ - RESTART/20210323.060000.fv_core.res.tile1.nc \ - RESTART/20210323.060000.fv_core.res.tile2.nc \ - RESTART/20210323.060000.fv_core.res.tile3.nc \ - RESTART/20210323.060000.fv_core.res.tile4.nc \ - RESTART/20210323.060000.fv_core.res.tile5.nc \ - RESTART/20210323.060000.fv_core.res.tile6.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \ - RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \ - RESTART/20210323.060000.fv_tracer.res.tile1.nc \ - RESTART/20210323.060000.fv_tracer.res.tile2.nc \ - RESTART/20210323.060000.fv_tracer.res.tile3.nc \ - RESTART/20210323.060000.fv_tracer.res.tile4.nc \ - RESTART/20210323.060000.fv_tracer.res.tile5.nc \ - RESTART/20210323.060000.fv_tracer.res.tile6.nc \ - RESTART/20210323.060000.phy_data.tile1.nc \ - RESTART/20210323.060000.phy_data.tile2.nc \ - RESTART/20210323.060000.phy_data.tile3.nc \ - RESTART/20210323.060000.phy_data.tile4.nc \ - RESTART/20210323.060000.phy_data.tile5.nc \ - RESTART/20210323.060000.phy_data.tile6.nc \ - RESTART/20210323.060000.sfc_data.tile1.nc \ - RESTART/20210323.060000.sfc_data.tile2.nc \ - RESTART/20210323.060000.sfc_data.tile3.nc \ - RESTART/20210323.060000.sfc_data.tile4.nc \ - RESTART/20210323.060000.sfc_data.tile5.nc \ - RESTART/20210323.060000.sfc_data.tile6.nc \ - RESTART/20210323.060000.MOM.res.nc \ - RESTART/iced.2021-03-23-21600.nc \ - RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ - 20210323.060000.out_pnt.ww3 \ - 20210323.060000.out_grd.ww3 " - -export_fv3 -export_cpl - -export CPLCHM=.false. -export DNATS=0 - -export RESTART_N=12 -export RESTART_INTERVAL="${RESTART_N} -1" -export OUTPUT_FH='0 21 24' - -# P8 UGWP1 -export GWD_OPT=2 -export CDMBWD=20.0,2.5,1.0,1.0 -export DO_UGWP_V1=.true. -export KNOB_UGWP_VERSION=1 -export KNOB_UGWP_NSLOPE=1 -export DO_UGWP_V0=.false. -export DO_GSL_DRAG_LS_BL=.true. -export DO_GSL_DRAG_SS=.true. -export DO_GSL_DRAG_TOFD=.true. -export DO_UGWP_V1_OROG_ONLY=.false. -export DO_UGWP_V0_NST_ONLY=.false. -export LDIAG_UGWP=.false. - -export TOPOEDITS=ufs.topo_edits_011818.nc -export MOM6_ALLOW_LANDMASK_CHANGES=True -export eps_imesh=2.5e-1 - -export FV3_RUN=cpld_control_run.IN -export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 -export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma -export DIAG_TABLE=diag_table_cpld_template -export INPUT_NML=cpld_control_ugwpv1.nml.IN -export NEMS_CONFIGURE=nems.configure.cpld_noaero_outwav.IN - -#GFSv17 settings -export PROGSIGMA=.true. - -if [[ $MACHINE_ID = cheyenne ]]; then - TPN=18 -fi