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

Wrapper PR for: Thompson inner loop, Thompson subcycling bugfix, remove snet from noah lsm, fix time dimension in restart files, rt.sh bugfix for PBS, and more! #702

Merged
merged 19 commits into from
Jul 23, 2021
Merged

Wrapper PR for: Thompson inner loop, Thompson subcycling bugfix, remove snet from noah lsm, fix time dimension in restart files, rt.sh bugfix for PBS, and more! #702

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7fb18d4
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jul 22, 2021
c02c8d9
Turn on several debug tests in rt.conf and rt_gnu.conf, fix bug in rt…
climbfuji Jul 22, 2021
efe51a1
Update submodule pointer for fv3atm
climbfuji Jul 22, 2021
c1aec04
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jul 22, 2021
b9c4ddc
Don't create baseline for control_stochy_restart runs
climbfuji Jul 22, 2021
5816815
Bug fixes in tests/rt_gnu.conf
climbfuji Jul 22, 2021
c0833b5
Comment out control_stochy_debug and control_ca_debug in rt_gnu.conf
climbfuji Jul 22, 2021
8e46aae
Turn off test control_csawmg on Cheyenne
climbfuji Jul 22, 2021
98cb298
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Jul 22, 2021
335702a
Regression test log for cheyenne.intel
climbfuji Jul 22, 2021
002ea13
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Jul 22, 2021
f43c0c1
Add wcoss cray log: all tests passed
MinsukJi-NOAA Jul 22, 2021
66f1b8f
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
97cbb96
Add wcoss dell p3 rt log: all tests passed
MinsukJi-NOAA Jul 23, 2021
f4aac80
Regression test log for hera.gnu
climbfuji Jul 23, 2021
47c08b4
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
4102444
Regression test log for hera.intel
climbfuji Jul 23, 2021
487f02a
Merge branch 'thompson_inner_loop_subcycling_bugfix_noah_bugfix_gnu_c…
climbfuji Jul 23, 2021
1fb0683
Revert change to .gitmodules and update submoduel pointer for fv3atm
climbfuji Jul 23, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/climbfuji/fv3atm
branch = thompson_inner_loop_subcycling_bugfix_noah_bugfix
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 6 files
+4 −2 .gitmodules
+18 −10 ccpp/data/GFS_typedefs.F90
+7 −0 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+170 −178 io/FV3GFS_io.F90
+56 −5 io/post_gfs.F90
209 changes: 111 additions & 98 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

891 changes: 450 additions & 441 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

784 changes: 405 additions & 379 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

239 changes: 126 additions & 113 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

792 changes: 409 additions & 383 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

810 changes: 418 additions & 392 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

652 changes: 333 additions & 319 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

1,026 changes: 526 additions & 500 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -46,7 +46,7 @@ RUN | control_c192
RUN | control_c384 | - gaea.intel wcoss_cray | fv3 |
RUN | control_c384gdas | - gaea.intel wcoss_cray | fv3 |
RUN | control_stochy | | fv3 |
RUN | control_stochy_restart | | fv3 | control_stochy
RUN | control_stochy_restart | | | control_stochy
RUN | control_ca | | fv3 |
RUN | control_lndp | | fv3 |
RUN | control_lheatstrg | | fv3 |
Expand All @@ -58,7 +58,7 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_
RUN | control_rrtmgp | | fv3 |
#RUN | control_rrtmgp_2threads | | |
#RUN | control_rrtmgp_c192 | | fv3 |
RUN | control_csawmg | -jet.intel | fv3 |
RUN | control_csawmg | - jet.intel cheyenne.intel | fv3 |
RUN | control_csawmgt | | fv3 |
RUN | control_flake | | fv3 |
RUN | control_ugwpv1 | | fv3 |
Expand Down Expand Up @@ -112,7 +112,7 @@ RUN | control_2threads_debug
RUN | control_CubedSphereGrid_debug | | fv3 |
RUN | control_wrtGauss_netcdf_parallel_debug | | fv3 |
RUN | control_stochy_debug | | fv3 |
#RUN | control_ca_debug | | fv3 |
RUN | control_ca_debug | | fv3 |
RUN | control_lndp_debug | | fv3 |
RUN | control_lheatstrg_debug | | fv3 |
RUN | control_merra2_debug | | fv3 |
Expand All @@ -121,7 +121,7 @@ RUN | control_csawmg_debug
RUN | control_csawmgt_debug | | fv3 |
RUN | control_ugwpv1_debug | | fv3 |
RUN | control_ras_debug | | fv3 |
#RUN | control_noahmp_debug | | fv3 |
RUN | control_noahmp_debug | | fv3 |
RUN | control_diag_debug | | fv3 |

COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_thompson -D32BIT=ON | | fv3 |
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20210721
BL_DATE=20210722
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down
15 changes: 9 additions & 6 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ RUN | control_thompson_no_aero
RUN | control_ugwpv1 | | fv3 |
RUN | control_ras | | fv3 |


COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1alpha,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |
RUN | fv3_gsd | | fv3 |
RUN | fv3_rrfs_v1alpha | | fv3 |
Expand Down Expand Up @@ -48,6 +47,10 @@ RUN | control_thompson_extdiag_debug
RUN | control_rrtmgp_debug | | fv3 |
RUN | control_ugwpv1_debug | | fv3 |
RUN | control_ras_debug | | fv3 |
# Both stochy and ca debug tests crash with GNU
#RUN | control_stochy_debug | | fv3 |
#RUN | control_ca_debug | | fv3 |
RUN | control_noahmp_debug | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf -DDEBUG=ON | | fv3 |
RUN | fv3_HAFS_v0_hwrf_thompson_debug | | fv3 |
Expand All @@ -61,14 +64,14 @@ RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug
# S2S tests #
##################################################################################################################################################################

COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled | | fv3 |
RUN | cpld_control | | fv3 |
COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled | - cheyenne.gnu | fv3 |
RUN | cpld_control | - cheyenne.gnu | fv3 |

COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled -DDEBUG=ON | | fv3 |
RUN | cpld_debug | | fv3 |
COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled -DDEBUG=ON | - cheyenne.gnu | fv3 |
RUN | cpld_debug | - cheyenne.gnu | fv3 |

##################################################################################################################################################################
# Data Atmosphere tests #
##################################################################################################################################################################

COMPILE | -DAPP=NG-GODAS-NEMSDATM | | fv3 |
COMPILE | -DAPP=NG-GODAS-NEMSDATM | - cheyenne.gnu | fv3 |
2 changes: 1 addition & 1 deletion tests/rt_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ submit_and_wait() {
status_label='held in a queue'
elif [[ $status = 'R' ]]; then
status_label='running'
elif [[ $status = 'E' ]] || [[ $status = 'C' ]]; then
elif [[ $status = 'E' ]] || [[ $status = 'C' ]] || [[ $status = '-' ]]; then
status_label='finished'
test_status='DONE'
exit_status=$( qstat ${jobid} -x -f | grep Exit_status | awk '{print $3}')
Expand Down