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

cam6_4_019: New CLUBB External to fix GPU problem #1086

Merged
merged 28 commits into from
Aug 12, 2024
Merged

cam6_4_019: New CLUBB External to fix GPU problem #1086

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bb48a6d
Update externals to match cesm2_3_alpha17f
cacraigucar May 14, 2024
1f0df19
put back in MCT since makefile mods would be required
cacraigucar May 14, 2024
93aa30e
Increase wall clock times
cacraigucar May 14, 2024
e91606a
revert times back for regression tests to original times
cacraigucar May 16, 2024
f816d1e
ChangeLog for cam6_3_161
cacraigucar May 16, 2024
4fc504c
remove the casper test suites
sjsprecious May 21, 2024
e79c4a3
add GPU test suite on Derecho
sjsprecious May 21, 2024
e779d59
swithc ERP to ERS test as nvhpc seems to have a bug with openmp
sjsprecious May 24, 2024
45b8710
Merge remote-tracking branch 'ESCOMP_CAM/cam_development' into gpu_re…
sjsprecious May 29, 2024
871336f
Updates for the new external
Katetc Jun 25, 2024
5cc3cf8
Merge remote-tracking branch 'jian/gpu_regression_test' into cam_dere…
cacraigucar Jun 26, 2024
dc472da
udpates for supporting GPU testing
cacraigucar Jun 26, 2024
dc7dbcd
Merge remote-tracking branch 'refs/remotes/origin/cam_derecho_test' i…
cacraigucar Jun 26, 2024
9cf174c
Updating clubb submodule
Katetc Jun 27, 2024
7c73bc7
Merge branch 'cam_development' into katetc/new_clubb_061424
Katetc Jul 9, 2024
88d8c3a
Update atmos_phys submodule for some reason
Katetc Jul 9, 2024
ed9a91c
Add GPU tests on derecho
cacraigucar Jul 12, 2024
55db0bb
Addressing first review comments
Katetc Jul 29, 2024
afde46e
A few more review comments
Katetc Jul 29, 2024
b4df86b
Bug fixes
Katetc Jul 29, 2024
29e2430
Merge pull request #12 from cacraigucar/cam_derecho_test
Katetc Jul 30, 2024
a251e59
Update ChangeLog template to include nvhpc tests on Derecho
Katetc Jul 30, 2024
b52730b
Bug fix for runs where CLUBB_SGS is not defined
Katetc Jul 31, 2024
efcd22b
Merge up to cam6_4_018
Katetc Jul 31, 2024
2abc5a0
Update to new new new CLUBB external (_gpufix_PosInf) and new CDEPS
Katetc Aug 9, 2024
8e05c34
Update to newest CDEPS tag cdeps1.0.45
Katetc Aug 9, 2024
86ba7de
Update ChangeLog with Derecho test results before machine goes down
Katetc Aug 9, 2024
ed684d2
Final updates
Katetc Aug 12, 2024
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ccs_config tag needs to be updated to ccs_config_cesm1.0.0 so that the CLUBB GPU code can be compiled correctly on the GPU.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current head of cam_development points to ccs_config_cesm1.0.0 so when this branch is merged up, the external will be correctly versioned.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Kate. That is great!

Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
url = https://github.com/larson-group/clubb_release
fxrequired = AlwaysRequired
fxsparse = ../.clubb_sparse_checkout
fxtag = clubb_4ncar_20231115_5406350
fxtag = clubb_4ncar_20240605_73d60f6
fxDONOTUSEurl = https://github.com/larson-group/clubb_release

[submodule "cism"]
Expand Down
4 changes: 4 additions & 0 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2238,6 +2238,7 @@
<do_hb_above_clubb >.false. </do_hb_above_clubb>
<do_hb_above_clubb phys="cam6" >.true. </do_hb_above_clubb>
<do_hb_above_clubb phys="cam7" >.true. </do_hb_above_clubb>

<!-- SILHS options -->
<clubb_do_icesuper silhs="1" > .true. </clubb_do_icesuper>
<clubb_C2rt silhs="1" > 0.2 </clubb_C2rt>
Expand All @@ -2263,6 +2264,7 @@
<clubb_skw_max_mag silhs="1" > 10.0 </clubb_skw_max_mag>
<clubb_up2_sfc_coef silhs="1" > 4.0 </clubb_up2_sfc_coef>
<clubb_C_wp2_splat silhs="1" > 0.0 </clubb_C_wp2_splat>
<clubb_bv_efold silhs="1" > 5.0 </clubb_bv_efold>

<clubb_l_brunt_vaisala_freq_moist silhs="1" > .true. </clubb_l_brunt_vaisala_freq_moist>
<clubb_l_call_pdf_closure_twice silhs="1" > .false. </clubb_l_call_pdf_closure_twice>
Expand All @@ -2281,6 +2283,8 @@
<clubb_l_vert_avg_closure silhs="1" > .false. </clubb_l_vert_avg_closure>
<clubb_l_diag_Lscale_from_tau silhs="1" > .false. </clubb_l_diag_Lscale_from_tau>
<clubb_l_damp_wp2_using_em silhs="1" > .false. </clubb_l_damp_wp2_using_em>
<clubb_wpxp_Ri_exp silhs="1" > 0.5 </clubb_wpxp_Ri_exp>
<clubb_z_displace silhs="1" > 25.00 </clubb_z_displace>


<!-- CLUBB+MF options -->
Expand Down
2 changes: 1 addition & 1 deletion src/atmos_phys
Open in desktop
Submodule atmos_phys updated 13 files
+62 −0 doc/ChangeLog
+176 −1 doc/NamesNotInDictionary.txt
+1 −1 kessler/kessler_update.meta
+17 −0 suite_tj2016.xml
+10 −0 test/test_sdfs/suite_tj2016_precip.xml
+12 −0 test/test_sdfs/suite_tj2016_sfc_pbl_hs.xml
+114 −0 tj2016/tj2016_precip.F90
+143 −0 tj2016/tj2016_precip.meta
+495 −0 tj2016/tj2016_sfc_pbl_hs.F90
+287 −0 tj2016/tj2016_sfc_pbl_hs.meta
+1 −1 utilities/geopotential_temp.meta
+1 −1 zhang_mcfarlane/zm_conv_evap.meta
+2 −2 zhang_mcfarlane/zm_convr.meta
Loading