Skip to content

Commit

Permalink
add spval test for stripe debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Oct 24, 2024
1 parent d898ea0 commit f6d6b2a
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 3 files
+13 −2 mediator/med.F90
+1 −1 mediator/med_internalstate_mod.F90
+10 −0 mediator/med_map_mod.F90
1 change: 1 addition & 0 deletions tests/parm/ufs.configure.s2s.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tests/tests/cpld_control_bilin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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`
Expand Down
119 changes: 119 additions & 0 deletions tests/tests/cpld_control_bilin_spval
View file
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions tests/tests/cpld_control_mapconsf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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`
Expand Down

0 comments on commit f6d6b2a

Please sign in to comment.