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

Update ccpp-physics. Make RRTMGP thread safe #418

Merged
merged 12 commits into from
Feb 25, 2021
Merged

Update ccpp-physics. Make RRTMGP thread safe #418

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a1fac73
Update ccpp-physics. Make RRTMGP thread safe
dustinswales Feb 16, 2021
ccb65da
Updated FV3/ccpp-physics. Added regression test for RRTMGP using two …
dustinswales Feb 18, 2021
5cb834c
Updated ccpp-physics and FV3
dustinswales Feb 23, 2021
c5a1c85
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Feb 23, 2021
31cc248
Changes from code review.
dustinswales Feb 23, 2021
3074910
Fixed whitespace in FV3/ccpp-physics.
dustinswales Feb 23, 2021
f38d4f6
Fix for RT setup.
dustinswales Feb 23, 2021
3ba71b3
Remove mpi_bcast for unallocated fields in FV3/ccpp-physics.
dustinswales Feb 23, 2021
cdb4106
Turn off RT for wcoss.
dustinswales Feb 24, 2021
dfb6fd0
Switched FV3 to NOAA-EMC. Updated .gitmodules.
dustinswales Feb 24, 2021
a385faa
Updated RT log files
dustinswales Feb 24, 2021
ea96726
Updated orion RT log. skip-ci.
dustinswales Feb 25, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/dustinswales/fv3atm
branch = hotfix_GPthreading
[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 4 files
+2 −2 .gitmodules
+11 −4 ccpp/data/GFS_typedefs.F90
+14 −0 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
1 change: 1 addition & 0 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ RUN | fv3_ccpp_gfs_v16_stochy
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | - cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP_c192L127 | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP_2thrd | | fv3 |

COMPILE | SUITES=FV3_GFS_v16_csawmg | | fv3 |
# fv3_ccpp_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests
Expand Down
84 changes: 84 additions & 0 deletions tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
###############################################################################
#
# FV3 CCPP GFS v16 w/ RRTMGP test using two openMP threads
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP GFS v16 w/ RRTMGP using two threads results with previous trunk version"

export CNTL_DIR=fv3_gfs_v16_RRTMGP_2thrd
dustinswales marked this conversation as resolved.
Show resolved Hide resolved

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc"


export_fv3
export THRD=2
export TPN=20
dustinswales marked this conversation as resolved.
Show resolved Hide resolved
DT_ATMOS="1200"
export DO_RRTMGP=.T.

export FV3_RUN=ccpp_gfs_v16_run.IN
export CCPP_SUITE=FV3_GFS_v16_RRTMGP
export INPUT_NML=ccpp_v16_c96_rrtmgp.nml.IN