Skip to content

Commit

Permalink
Wrapper PR for: Thompson inner loop, Thompson subcycling bugfix, remo…
Browse files Browse the repository at this point in the history 
…ve snet from noah lsm, fix time dimension in restart files, rt.sh bugfix for PBS, and more! (ufs-community#702)

This PR combines many changes:

 update of submodule pointers for fv3atm and ccpp-physics:
        Thompson inner loop from @RuiyuSun
        Thompson subcycling bugfix from @climbfuji
        Noah/NoahMP bugfix/remove snet from Noah LSM from @HelinWei-NOAA
        Fix time dimension in restart files from @climbfuji
    Bug fix in rt_utils.sh to correctly detect job failures on Cheyenne with PBS, turn off coupled debug compilation/tests for GNU. which now fail, same for test control_csawmg; from @DeniseWorthen and @DusanJovic-NOAA
    Turn on several debug tests in rt.conf and rt_gnu.conf from @junwang-noaa
        Note. control_stochy_debug and control_ca_debug still not working with GNU
    Don't create baseline for control_stochy_restart run (in rt.conf) from @junwang-noaa

The changes in fv3atm and ccpp-physics do change the results of all regression tests, new baseline date is 20210721.
  • Loading branch information
@climbfuji
climbfuji authored Jul 23, 2021
1 parent 40b6975 commit c413ccf
Show file tree
Hide file tree
Showing 14 changed files with 3,218 additions and 3,036 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 5 files
+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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

822 changes: 424 additions & 398 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/rt.conf
View file
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
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
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
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

0 comments on commit c413ccf

Please sign in to comment.