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

Jump to bottom

Feature/v16 gaussian #1

Merged
merged 25 commits into from
May 4, 2021
Merged

Feature/v16 gaussian #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
09716fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
f778ec2
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 5, 2021
3ae6d69
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 9, 2021
f187e64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 10, 2021
94f5e67
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 12, 2021
4100179
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 15, 2021
42d1a64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 16, 2021
8a5575b
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 19, 2021
9a06325
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 20, 2021
6ba165f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 21, 2021
1602558
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 22, 2021
2208dea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 26, 2021
217e3f0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 27, 2021
c553a61
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 28, 2021
52625f5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
a248612
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
9a80b95
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 3, 2021
4bd838d
switch cpld v16 tests to gaussian output
DeniseWorthen May 4, 2021
e9ac4d6
Merge remote-tracking branch 'JessicaMeixner/makewavetemplateinput' i…
DeniseWorthen May 4, 2021
9ce0a38
add v16 tests on gaea
DeniseWorthen May 4, 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
8 changes: 4 additions & 4 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ RUN | cpld_bmarkfrac
RUN | cpld_restart_bmarkfrac | - wcoss_cray | | cpld_bmarkfrac

#6h/6h/12h restart test
# test fails on gaea with esmfpio error
RUN | cpld_bmarkfrac_v16 | - wcoss_cray gaea.intel | fv3 |
RUN | cpld_bmarkfrac_v16_nsst | - wcoss_cray gaea.intel | fv3 |
RUN | cpld_restart_bmarkfrac_v16 | - wcoss_cray gaea.intel | | cpld_bmarkfrac_v16
# test fails on gaea with esmfpio error for tiled output
RUN | cpld_bmarkfrac_v16 | - wcoss_cray | fv3 |
RUN | cpld_bmarkfrac_v16_nsst | - wcoss_cray | fv3 |
RUN | cpld_restart_bmarkfrac_v16 | - wcoss_cray | | cpld_bmarkfrac_v16

COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled | - wcoss_cray | fv3 |
RUN | cpld_bmark_wave | - wcoss_cray | fv3 |
Expand Down
15 changes: 3 additions & 12 deletions tests/tests/cpld_bmarkfrac_v16
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX02

export CNTL_DIR="cpld_bmarkfrac_v16"

export LIST_FILES="phyf012.tile1.nc \
phyf012.tile2.nc \
phyf012.tile3.nc \
phyf012.tile4.nc \
phyf012.tile5.nc \
phyf012.tile6.nc \
dynf012.tile1.nc \
dynf012.tile2.nc \
dynf012.tile3.nc \
dynf012.tile4.nc \
dynf012.tile5.nc \
dynf012.tile6.nc \
export LIST_FILES="phyf012.nc \
dynf012.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
Expand Down Expand Up @@ -89,6 +79,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down
1 change: 1 addition & 0 deletions tests/tests/cpld_bmarkfrac_v16_35d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down
15 changes: 3 additions & 12 deletions tests/tests/cpld_bmarkfrac_v16_nsst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX02

export CNTL_DIR="cpld_bmarkfrac_v16_nsst"

export LIST_FILES="phyf012.tile1.nc \
phyf012.tile2.nc \
phyf012.tile3.nc \
phyf012.tile4.nc \
phyf012.tile5.nc \
phyf012.tile6.nc \
dynf012.tile1.nc \
dynf012.tile2.nc \
dynf012.tile3.nc \
dynf012.tile4.nc \
dynf012.tile5.nc \
dynf012.tile6.nc \
export LIST_FILES="phyf012.nc \
dynf012.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
Expand Down Expand Up @@ -89,6 +79,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down
15 changes: 3 additions & 12 deletions tests/tests/cpld_bmarkfrac_wave_v16
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,8 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127

export CNTL_DIR="cpld_bmarkfrac_wave_v16"

export LIST_FILES="phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.tile6.nc \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.tile6.nc \
export LIST_FILES="phyf006.nc \
dynf006.nc \
20130401.060000.out_grd.gwes_30m \
20130401.060000.out_pnt.points \
RESTART/coupler.res \
Expand Down Expand Up @@ -92,6 +82,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down
1 change: 1 addition & 0 deletions tests/tests/cpld_bmarkfrac_wave_v16_35d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down
15 changes: 3 additions & 12 deletions tests/tests/cpld_restart_bmarkfrac_v16
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX02

export CNTL_DIR="cpld_bmarkfrac_v16"

export LIST_FILES="phyf012.tile1.nc \
phyf012.tile2.nc \
phyf012.tile3.nc \
phyf012.tile4.nc \
phyf012.tile5.nc \
phyf012.tile6.nc \
dynf012.tile1.nc \
dynf012.tile2.nc \
dynf012.tile3.nc \
dynf012.tile4.nc \
dynf012.tile5.nc \
dynf012.tile6.nc \
export LIST_FILES="phyf012.nc \
dynf012.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
Expand Down Expand Up @@ -93,6 +83,7 @@ export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES='025'
export ICERES='0.25'
Expand Down