Skip to content

Add coupled IAU RT test #1916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zach1221 merged 18 commits into from
Oct 12, 2023
Merged

Add coupled IAU RT test #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4046c24
add cpld_bmark_p8_iau test
junwang-noaa Aug 17, 2023
ac1a1eb
set up cpld_gfsv17 c96 iau test
junwang-noaa Sep 21, 2023
7ffa4ed
add tests/cpld_control_gfsv17_iau
junwang-noaa Sep 21, 2023
e9a7fe7
sync to develop branch
junwang-noaa Sep 21, 2023
5be8896
remove cpld_bmark_p8_iau
junwang-noaa Sep 26, 2023
10d337d
sync MOM input template with global-workflow
junwang-noaa Oct 6, 2023
5a253a1
add a diag_table that works with fms fix
junwang-noaa Oct 6, 2023
6c916a6
fix MOM_IAU
junwang-noaa Oct 6, 2023
de19478
update MOM_input_template_500
junwang-noaa Oct 10, 2023
b00b10a
Merge remote-tracking branch 'upstream/develop' into couplediau
junwang-noaa Oct 10, 2023
632aa10
update cpld_control_run with correct directories
DeniseWorthen Oct 11, 2023
7e73ac1
Acorn RT Log
BrianCurtis-NOAA Oct 11, 2023
add1c6c
add orion RT logs: passed
zach1221 Oct 11, 2023
3b9e694
add hercules RT logs: passed
zach1221 Oct 11, 2023
cdcc3c9
WCOSS2 RT Log
BrianCurtis-NOAA Oct 11, 2023
cb18ff2
add jet RT logs: passed
zach1221 Oct 12, 2023
3daf2e2
add gaea RT logs: passed
zach1221 Oct 12, 2023
5a6d31c
add hera RT logs: passed
zach1221 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,6 @@ export OUTPUT_FH="12 -1"
export NFHOUT=12
export NFHMAX_HF=12
export NFHOUT_HF=6
export IAU_OFFSET=0
export FHZERO=6
export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb'"
Expand Down Expand Up @@ -587,6 +586,9 @@ export LNDP_MODEL_TYPE=0

#IAU
export IAU_INC_FILES="''"
export IAU_DELTHRS=0
export IAUFHRS=-1
export IAU_OFFSET=0

export FH_DFI_RADAR='-2e10'

Expand All @@ -595,8 +597,6 @@ export DO_CA=.false.
export CA_SGS=.false.
export CA_GLOBAL=.false.

export IAU_DRYMASSFIXER=.false.

#waves
export WW3RSTDTHR=12
export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
Expand Down Expand Up @@ -874,8 +874,14 @@ export MOM6_THERMO_SPAN=False
export MOM6_USE_WAVES=True
export MOM6_ALLOW_LANDMASK_CHANGES=False
# MOM6 IAU
export MOM_IAU=False
export MOM_IAU_HRS=6
export ODA_INCUPD=False
export ODA_INCUPD_NHOURS=6
export ODA_TEMPINC_VAR="'pt_inc'"
export ODA_SALTINC_VAR="'s_inc'"
export ODA_THK_VAR="'h_fg'"
export ODA_INCUPD_UV=False
export ODA_UINC_VAR="'u_inc'"
export ODA_VINC_VAR="'v_inc'"
# MOM6 stochastics
export DO_OCN_SPPT=False
export PERT_EPBL=False
Expand Down Expand Up @@ -1032,8 +1038,14 @@ export MOM6_RIVER_RUNOFF=False
export FRUNOFF=''
export CHLCLIM=seawifs_1998-2006_smoothed_2X.nc
# MOM6 IAU
export MOM_IAU=False
export MOM_IAU_HRS=6
export ODA_INCUPD=False
export ODA_INCUPD_NHOURS=6
export ODA_TEMPINC_VAR="'pt_inc'"
export ODA_SALTINC_VAR="'s_inc'"
export ODA_THK_VAR="'h_fg'"
export ODA_INCUPD_UV=False
export ODA_UINC_VAR="'u_inc'"
export ODA_VINC_VAR="'v_inc'"
export MOM6_USE_LI2016=False
# MOM6 stochastics
export DO_OCN_SPPT=False
Expand Down
6 changes: 6 additions & 0 deletions tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ else
RFILE_OLD=$(basename $RFILE)
mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
done
if [[ $IAU_OFFSET == 6 ]] && [[ $FHROT -le 6 ]]; then
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/fv_increment*.nc ./INPUT/.
fi

#if not mx025, then mom6 restart is a single file
if [[ $OCNRES == 025 ]]; then
Expand All @@ -105,6 +108,9 @@ else
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_3.nc ./INPUT/MOM.res_3.nc
else
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
if [[ $ODA_INCUPD == 'True' ]] && [[ $FHROT -le 6 ]]; then
cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
fi
fi

# CMEPS restart and pointer files
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/cpld_datm_cdeps.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ $WARM_START = .false. ]; then
else
cp @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM6_IC_TS*.nc ./INPUT/MOM6_IC_TS.nc
cp @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc.res_2011100100.nc cice_model.res.nc
if [[ $MOM_IAU == 'True' ]];then
if [[ $ODA_INCUPD == 'True' ]];then
cp @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/mom6_increment.nc ./INPUT/mom6_increment.nc
fi
fi
Expand Down
1,762 changes: 889 additions & 873 deletions tests/logs/RegressionTests_acorn.log
View file
Open in desktop

Large diffs are not rendered by default.

1,776 changes: 896 additions & 880 deletions tests/logs/RegressionTests_gaea.log
View file
Open in desktop

Large diffs are not rendered by default.

2,506 changes: 1,261 additions & 1,245 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

2,454 changes: 1,235 additions & 1,219 deletions tests/logs/RegressionTests_hercules.log
View file
Open in desktop

Large diffs are not rendered by default.

1,578 changes: 797 additions & 781 deletions tests/logs/RegressionTests_jet.log
View file
Open in desktop

Large diffs are not rendered by default.

2,133 changes: 1,057 additions & 1,076 deletions tests/logs/RegressionTests_orion.log
View file
Open in desktop

Large diffs are not rendered by default.

1,582 changes: 799 additions & 783 deletions tests/logs/RegressionTests_wcoss2.log
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions tests/parm/MOM_input_template_025
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,31 @@ ENERGYSAVEDAYS = 1.00 ! [days] default = 1.0

! === module ocean_model_init ===

! === module MOM_oda_incupd ===
ODA_INCUPD = @[ODA_INCUPD] ! [Boolean] default = False
! If true, oda incremental updates will be applied
! everywhere in the domain.
ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.

ODA_TEMPINC_VAR = @[ODA_TEMPINC_VAR] ! default = "ptemp_inc"
! The name of the potential temperature inc. variable in
! ODA_INCUPD_FILE.
ODA_SALTINC_VAR = @[ODA_SALTINC_VAR] ! default = "sal_inc"
! The name of the salinity inc. variable in
! ODA_INCUPD_FILE.
ODA_THK_VAR = @[ODA_THK_VAR] ! default = "h"
! The name of the int. depth inc. variable in
! ODA_INCUPD_FILE.
ODA_INCUPD_UV = @[ODA_INCUPD_UV] !
ODA_UINC_VAR = @[ODA_UINC_VAR] ! default = "u_inc"
! The name of the zonal vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_VINC_VAR = @[ODA_VINC_VAR] ! default = "v_inc"
! The name of the meridional vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS] ! default=3.0
! Number of hours for full update (0=direct insertion).

! === module MOM_surface_forcing ===
OCEAN_SURFACE_STAGGER = "A" ! default = "C"
! A case-insensitive character string to indicate the
Expand Down
27 changes: 26 additions & 1 deletion tests/parm/MOM_input_template_050
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +860,33 @@ USE_NEUTRAL_DIFFUSION = True ! [Boolean] default = False
! If true, enables the neutral diffusion module.

! === module ocean_model_init ===

RESTART_CHECKSUMS_REQUIRED = False

! === module MOM_oda_incupd ===
ODA_INCUPD = @[ODA_INCUPD] ! [Boolean] default = False
! If true, oda incremental updates will be applied
! everywhere in the domain.
ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.

ODA_TEMPINC_VAR = @[ODA_TEMPINC_VAR] ! default = "ptemp_inc"
! The name of the potential temperature inc. variable in
! ODA_INCUPD_FILE.
ODA_SALTINC_VAR = @[ODA_SALTINC_VAR] ! default = "sal_inc"
! The name of the salinity inc. variable in
! ODA_INCUPD_FILE.
ODA_THK_VAR = @[ODA_THK_VAR] ! default = "h"
! The name of the int. depth inc. variable in
! ODA_INCUPD_FILE.
ODA_INCUPD_UV = @[ODA_INCUPD_UV] !
ODA_UINC_VAR = @[ODA_UINC_VAR] ! default = "u_inc"
! The name of the zonal vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_VINC_VAR = @[ODA_VINC_VAR] ! default = "v_inc"
! The name of the meridional vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS] ! default=3.0
! Number of hours for full update (0=direct insertion).

! === module MOM_lateral_boundary_diffusion ===
! This module implements lateral diffusion of tracers near boundaries

Expand Down
50 changes: 25 additions & 25 deletions tests/parm/MOM_input_template_100
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,31 +74,6 @@ WRITE_GEOM = 2 ! default = 1
SAVE_INITIAL_CONDS = False ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.

! === module MOM_oda_incupd ===
ODA_INCUPD = @[MOM_IAU] ! [Boolean] default = False
! If true, oda incremental updates will be applied
! everywhere in the domain.
ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.

ODA_TEMPINC_VAR = "pt_inc" ! default = "ptemp_inc"
! The name of the potential temperature inc. variable in
! ODA_INCUPD_FILE.
ODA_SALTINC_VAR = "s_inc" ! default = "sal_inc"
! The name of the salinity inc. variable in
! ODA_INCUPD_FILE.
ODA_THK_VAR = "h_fg" ! default = "h"
! The name of the int. depth inc. variable in
! ODA_INCUPD_FILE.

ODA_UINC_VAR = "u_inc" ! default = "u_inc"
! The name of the zonal vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_VINC_VAR = "v_inc" ! default = "v_inc"
! The name of the meridional vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_INCUPD_NHOURS = @[MOM_IAU_HRS] ! default=3.0
! Number of hours for full update (0=direct insertion).

! === module MOM_domains ===
TRIPOLAR_N = True ! [Boolean] default = False
! Use tripolar connectivity at the northern edge of the domain. With
Expand Down Expand Up @@ -832,6 +807,31 @@ ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0

! === module ocean_model_init ===

! === module MOM_oda_incupd ===
ODA_INCUPD = @[ODA_INCUPD] ! [Boolean] default = False
! If true, oda incremental updates will be applied
! everywhere in the domain.
ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.

ODA_TEMPINC_VAR = @[ODA_TEMPINC_VAR] ! default = "ptemp_inc"
! The name of the potential temperature inc. variable in
! ODA_INCUPD_FILE.
ODA_SALTINC_VAR = @[ODA_SALTINC_VAR] ! default = "sal_inc"
! The name of the salinity inc. variable in
! ODA_INCUPD_FILE.
ODA_THK_VAR = @[ODA_THK_VAR] ! default = "h"
! The name of the int. depth inc. variable in
! ODA_INCUPD_FILE.
ODA_INCUPD_UV = @[ODA_INCUPD_UV] !
ODA_UINC_VAR = @[ODA_UINC_VAR] ! default = "u_inc"
! The name of the zonal vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_VINC_VAR = @[ODA_VINC_VAR] ! default = "v_inc"
! The name of the meridional vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS] ! default=3.0
! Number of hours for full update (0=direct insertion).

! === module MOM_surface_forcing ===
OCEAN_SURFACE_STAGGER = "A" ! default = "C"
! A case-insensitive character string to indicate the
Expand Down
25 changes: 25 additions & 0 deletions tests/parm/MOM_input_template_500
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,31 @@ MAXTRUNC = 1000 ! [truncations save_interval-1] default = 0

! === module ocean_model_init ===

! === module MOM_oda_incupd ===
ODA_INCUPD = @[ODA_INCUPD] ! [Boolean] default = False
! If true, oda incremental updates will be applied
! everywhere in the domain.
ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.

ODA_TEMPINC_VAR = @[ODA_TEMPINC_VAR] ! default = "ptemp_inc"
! The name of the potential temperature inc. variable in
! ODA_INCUPD_FILE.
ODA_SALTINC_VAR = @[ODA_SALTINC_VAR] ! default = "sal_inc"
! The name of the salinity inc. variable in
! ODA_INCUPD_FILE.
ODA_THK_VAR = @[ODA_THK_VAR] ! default = "h"
! The name of the int. depth inc. variable in
! ODA_INCUPD_FILE.
ODA_INCUPD_UV = @[ODA_INCUPD_UV] !
ODA_UINC_VAR = @[ODA_UINC_VAR] ! default = "u_inc"
! The name of the zonal vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_VINC_VAR = @[ODA_VINC_VAR] ! default = "v_inc"
! The name of the meridional vel. inc. variable in
! ODA_INCUPD_UV_FILE.
ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS] ! default=3.0
! Number of hours for full update (0=direct insertion).

! === module MOM_surface_forcing ===
OCEAN_SURFACE_STAGGER = "A" ! default = "C"
! A case-insensitive character string to indicate the
Expand Down
5 changes: 5 additions & 0 deletions tests/parm/cpld_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
agrid_vel_rst = .true.
read_increment = @[READ_INCREMENT]
res_latlon_dynamics = @[RES_LATLON_DYNAMICS]

/

&external_ic_nml
Expand Down Expand Up @@ -218,6 +219,10 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
iaufhrs = @[IAUFHRS]
iau_delthrs = @[IAU_DELTHRS]
iau_inc_files= @[IAU_INC_FILES]
iau_drymassfixer = .false.
use_med_flux = @[USE_MED_FLUX]
frac_grid = @[FRAC_GRID]
cplchm = @[CPLCHM]
Expand Down
Loading