diff --git a/.gitmodules b/.gitmodules index 46d290d3d8..8e2a6a7dbd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,7 +19,7 @@ #url = https://github.com/NOAA-EMC/CMEPS.git #branch = emc/develop url = https://github.com/DeniseWorthen/CMEPS.git - branch = bugfix/bilin_new + branch = bugfix/stripes [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index cfea051669..a55c9b53d2 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit cfea05166973d225f16942bd9b77d9a9f72dd706 +Subproject commit a55c9b53d2a3ac51e7295350f0761d8ceb906bec diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN index 97875e75fb..9013758c8d 100644 --- a/tests/parm/ufs.configure.s2s.IN +++ b/tests/parm/ufs.configure.s2s.IN @@ -94,6 +94,7 @@ MED_attributes:: pio_rearranger = @[pio_rearranger] ocean_albedo_limit = @[ocean_albedo_limit] test_interp = @[TESTMAP] + test_spval = @[TESTSPVAL] dststatus_print = true history_n_atm_inst = 1 history_option_atm_inst = nsteps diff --git a/tests/tests/cpld_control_bilin b/tests/tests/cpld_control_bilin index 102ec39f16..4915c95fb5 100644 --- a/tests/tests/cpld_control_bilin +++ b/tests/tests/cpld_control_bilin @@ -73,6 +73,8 @@ export_cpl export_ugwpv1 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FHMAX=2 + export RESTART_N=12 export RESTART_INTERVAL="${RESTART_N} -1" export OUTPUT_FH='0 21 24' @@ -88,6 +90,7 @@ ICE_tasks=$ICE_tasks_cpl_dflt export WAV_tasks=0 export TESTMAP=mapbilnr +export TESTSPVAL=false export CICE_NPROC=$ICE_tasks export np2=`expr $CICE_NPROC / 2` diff --git a/tests/tests/cpld_control_bilin_spval b/tests/tests/cpld_control_bilin_spval new file mode 100644 index 0000000000..c9c5f0cef3 --- /dev/null +++ b/tests/tests/cpld_control_bilin_spval @@ -0,0 +1,119 @@ +# +# cpld_control C96 noaero P8 test +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100" + +export CNTL_DIR=cpld_control_c96_noaero_p8 + +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" + +#TODO: add comparison of CA restart files? + +export_fv3 +export_cpl +export_ugwpv1 +export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 + +export FHMAX=2 + +export RESTART_N=12 +export RESTART_INTERVAL="${RESTART_N} -1" +export OUTPUT_FH='0 21 24' +export MED_history_n=1 + +export INPES=$INPES_cpl_dflt +export JNPES=$JNPES_cpl_dflt +export atm_omp_num_threads=$THRD_cpl_dflt +export WRTTASK_PER_GROUP=$WPG_cpl_dflt + +OCN_tasks=$OCN_tasks_cpl_dflt +ICE_tasks=$ICE_tasks_cpl_dflt +export WAV_tasks=0 + +export TESTMAP=mapbilnr +export TESTSPVAL=true + +export CICE_NPROC=$ICE_tasks +export np2=`expr $CICE_NPROC / 2` +export CICE_BLCKX=`expr $NX_GLB / $np2` +export CICE_BLCKY=`expr $NY_GLB / 2` + +export CPLWAV=.false. +export CPLWAV2ATM=.false. +export MOM6_USE_WAVES=False +export eps_imesh=2.5e-1 + +export CPLCHM=.false. +export DNATS=0 +export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc +export MOM6_ALLOW_LANDMASK_CHANGES=True + +export DIAG_TABLE=diag_table_template +export UFS_CONFIGURE=ufs.configure.s2s.IN +export FV3_RUN=cpld_control_run.IN + +export K_SPLIT=2 +export N_SPLIT=5 + +# HR4 GFSv17 GWD update +export DO_GWD_OPT_PSL=.true. +export DO_GSL_DRAG_SS=.false. diff --git a/tests/tests/cpld_control_mapconsf b/tests/tests/cpld_control_mapconsf index a59ab22dff..f84b0b3b74 100644 --- a/tests/tests/cpld_control_mapconsf +++ b/tests/tests/cpld_control_mapconsf @@ -73,6 +73,8 @@ export_cpl export_ugwpv1 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 +export FHMAX=2 + export RESTART_N=12 export RESTART_INTERVAL="${RESTART_N} -1" export OUTPUT_FH='0 21 24' @@ -88,6 +90,7 @@ ICE_tasks=$ICE_tasks_cpl_dflt export WAV_tasks=0 export TESTMAP=mapconsf +export TESTSPVAL=false export CICE_NPROC=$ICE_tasks export np2=`expr $CICE_NPROC / 2`