Skip to content
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

add frac grid input, update and add additional cpld tests #354

Merged
merged 48 commits into from
Jan 6, 2021
Merged

add frac grid input, update and add additional cpld tests #354

Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
73b0c9d
test new input
DeniseWorthen Dec 17, 2020
fa18812
Merge branch 'develop' into feature/updateinput
DeniseWorthen Dec 18, 2020
72ef6b7
changes for checkpoint restarts
DeniseWorthen Dec 21, 2020
2faa781
update tests
DeniseWorthen Dec 21, 2020
fe05576
test of 3 restart tests on hera; skip-ci
DeniseWorthen Dec 21, 2020
14a0452
Merge branch 'develop' into feature/cpld_checkpoint_restarts
DeniseWorthen Dec 22, 2020
980f9c7
fix instances of srf_data.*; skip-ci
DeniseWorthen Dec 23, 2020
2aef386
update bmark restart test to run from hour 12; skip-ci
DeniseWorthen Dec 23, 2020
2dc4f86
Merge branch 'develop' into feature/cpld_checkpoint_restarts
DeniseWorthen Dec 28, 2020
7656418
Merge branch 'develop' into feature/cpld_checkpoint_restarts
DeniseWorthen Dec 30, 2020
454bf17
fix spacing in rt.conf; skip-ci
DeniseWorthen Dec 30, 2020
86b698d
Merge branch 'develop' into feature/cpld_checkpoint_restarts
DeniseWorthen Dec 30, 2020
42b2978
update rt.conf for cpld and datm
DeniseWorthen Dec 30, 2020
13f76b7
add cheyenne.intel logs; skip-ci
DeniseWorthen Dec 30, 2020
a91e7fb
add orion.intel log; skip-ci
DeniseWorthen Dec 30, 2020
d674aa5
add cheyenne.gnu log; skip-ci
DeniseWorthen Dec 30, 2020
7002281
add hera.intel log; skip-ci
DeniseWorthen Dec 30, 2020
4612323
add dell-p3 log; skip-ci
DeniseWorthen Dec 31, 2020
6cbb15c
add wcoss-cray log; skip-ci
DeniseWorthen Dec 31, 2020
0336894
add gaea.intel and jet.intel logs; skip-ci
DeniseWorthen Dec 31, 2020
d1112b0
add hera.gnu log
DeniseWorthen Dec 31, 2020
7ca770d
Merge branch 'develop' into feature/updateinput
DeniseWorthen Dec 31, 2020
1f902fa
Merge remote-tracking branch 'origin/feature/cpld_checkpoint_restarts…
DeniseWorthen Dec 31, 2020
e9b580f
update rt.sh for new input
DeniseWorthen Dec 31, 2020
af254eb
update fv3_conf cpld files for L127 and new frac grid location
DeniseWorthen Dec 31, 2020
c8f6cf0
Merge branch 'develop' into feature/updateinput
DeniseWorthen Dec 31, 2020
c6f0ebc
add cpld bmark wave tests with frac grid
DeniseWorthen Dec 31, 2020
ea03fd7
add L127 gfs_ctrl fix
DeniseWorthen Jan 1, 2021
66a1086
cpld tests pass except for bmark
DeniseWorthen Jan 1, 2021
037d109
remove non-default settings
DeniseWorthen Jan 1, 2021
31228f3
remove extra rt.test; change comment in fv3_conf files
DeniseWorthen Jan 1, 2021
b4e9e7d
add tests
DeniseWorthen Jan 1, 2021
3545be3
move text in test
DeniseWorthen Jan 1, 2021
f618dfa
pass all new baselines
DeniseWorthen Jan 2, 2021
47cbbe7
add tests, modify input data root
DeniseWorthen Jan 4, 2021
9a4df8a
add gfsv16 test and input nml from Shan
DeniseWorthen Jan 4, 2021
8837ff5
add RUN and test for v16
DeniseWorthen Jan 4, 2021
883bac0
add non-wave v16 test and restart (6h/6h/12h)
DeniseWorthen Jan 4, 2021
ad9ffd7
fix nml in restart bmarkfrac v16 test
DeniseWorthen Jan 5, 2021
c60c443
fix cpld bmark run, retain current REPRO setting for bmark+wave tests
DeniseWorthen Jan 5, 2021
e5bca0b
update RTPWD date to develop-20210105
DeniseWorthen Jan 5, 2021
795357c
fix typo in ozone filename for cpld_control_run
DeniseWorthen Jan 5, 2021
31d60a8
add wcoss-cray log; skip-ci
DeniseWorthen Jan 5, 2021
70b3dbd
add orion.intel log; skip-ci
DeniseWorthen Jan 6, 2021
b5e16ac
add hera.intel log; skip-ci
DeniseWorthen Jan 6, 2021
9862bf0
add wcoss_dell_p3 log; skip-ci
DeniseWorthen Jan 6, 2021
43b51bb
add cheyenne intel,gnu logs; gaea.intel and jet.intel; skip ci
DeniseWorthen Jan 6, 2021
bcc606c
add hera.gnu log
DeniseWorthen Jan 6, 2021
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
3,918 changes: 223 additions & 3,695 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions tests/fv3_conf/cpld_bmark_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ fi
ICERES="${OCNRES:0:1}.${OCNRES:1}"

BM_IC=BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}
FV3_IC=${BM_IC}/gfs/@[ATMRES]/INPUT
if [[ ${FRAC_GRID_INPUT} = .F. ]]; then
FV3_IC=${BM_IC}/gfs/@[ATMRES]/INPUT
elif [[ @[NPZ] == '127' ]]; then
FV3_IC=FV3_input_frac/${BM_IC}/gfs/@[ATMRES]_L@[NPZ]/INPUT
else
FV3_IC=FV3_input_frac/${BM_IC}/gfs/@[ATMRES]/INPUT
fi
MOM6_IC=${BM_IC}/mom6_da
CICE_IC=${BM_IC}/cpc
WW3_IC=${BM_IC}/ww3
Expand All @@ -29,9 +35,20 @@ cp @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
cp @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
cp @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
# NOTE: No L127 FV3_DIR input for non-frac grid input except for C96
if [ ${FRAC_GRID_INPUT} = .F. ]; then
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
else
if [[ $NPZ == '127' ]]; then
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
else
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
fi
fi
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT

# MOM6 fixed input
cp @[INPUTDATA_ROOT]/MOM6_FIX/@[OCNRES]/* ./INPUT
Expand Down
22 changes: 19 additions & 3 deletions tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
mkdir INPUT RESTART history MOM6_OUTPUT

if [[ $ATMRES == 'C96' ]]; then
if [[ $NPZ == '127' ]]; then
FV3_DIR=FV3_input_data_127
else
FV3_DIR=FV3_input_data
fi
else
FV3_DIR=FV3_input_data${ATMRES#C}
fi
Expand All @@ -23,13 +27,20 @@ cp @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
cp @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
cp @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
# NOTE: No L127 FV3_DIR for non-frac grid input except for C96
if [ ${FRAC_GRID_INPUT} = .F. ]; then
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
else
if [[ $NPZ == '127' ]]; then
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
else
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
fi
fi
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT

# MOM6 fixed input
cp @[INPUTDATA_ROOT]/MOM6_FIX/@[OCNRES]/* ./INPUT
Expand All @@ -46,8 +57,13 @@ if [ $WARM_START = .F. ]; then
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
else
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
if [[ $NPZ == '127' ]]; then
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_l127.mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
else
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
fi
fi
cp @[INPUTDATA_ROOT]/MOM6_IC/MOM*.nc ./INPUT
cp @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].res_2016100300.nc ./cice_model.res.nc
Expand Down
7 changes: 0 additions & 7 deletions tests/parm/MOM_input_template_100
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,6 @@ CHANNEL_CONFIG = "list" ! default = "none"
! NetCDF file on the model grid.
CHANNEL_LIST_FILE = "MOM_channels_SPEAR" ! default = "MOM_channel_list"
! The file from which the list of narrowed channels is read.
GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = False
! If true, use an older algorithm to calculate the sine and cosines needed
! rotate between grid-oriented directions and true north and east. Differences
! arise at the tripolar fold.
USE_TRIPOLAR_GEOLONB_BUG = False ! [Boolean] default = False
! If true, use older code that incorrectly sets the longitude in some points
! along the tripolar fold to be off by 360 degrees.

! === module MOM_verticalGrid ===
! Parameters providing information about the vertical grid.
Expand Down
Loading