Skip to content

Commit

Permalink
Merge branch 'update/cam_gpu_clubb' into 'develop' (PR #72)
Browse files Browse the repository at this point in the history
Bring in upstream tag cam6_4_019 into EarthWorksOrg/CAM for the GPU
CLUBB changes.

Also update to cdeps1.0.45 to match the cam6_4_019 version. cdeps tags
between cdeps1.0.38 and cdeps1.0.44 caused some test failures in
ESCOMP/CAM.
  • Loading branch information
gdicker1 committed Sep 5, 2024
2 parents bad259b + 8acbfe6 commit d4df5c3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
path = components/cam
url = https://www.github.com/EarthWorksOrg/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam-ew2.3.003
fxtag = cam-ew2.3.004
fxrequired = ToplevelRequired

[submodule "clm"]
Expand Down Expand Up @@ -97,7 +97,7 @@
url = https://github.com/ESCOMP/CDEPS
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
fxrequired = ToplevelRequired
fxtag = cdeps1.0.43
fxtag = cdeps1.0.45

[submodule "cmeps"]
path = components/cmeps
Expand Down
3 changes: 3 additions & 0 deletions cime_config/usermods_dirs/eworg_opt_clubb/user_nl_cam
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
clubb_l_diag_lscale_from_tau = .true.
clubb_penta_solve_method = 2
clubb_tridiag_solve_method = 2
2 changes: 1 addition & 1 deletion components/cam
Submodule cam updated 28 files
+3 −3 .gitmodules
+1 −1 .lib/git-fleximod/git_fleximod/cli.py
+8 −7 .lib/git-fleximod/git_fleximod/git_fleximod.py
+23 −10 .lib/git-fleximod/git_fleximod/submodule.py
+1 −1 .lib/git-fleximod/pyproject.toml
+1 −1 .lib/git-fleximod/tbump.toml
+4 −0 bld/configure
+5 −1 bld/namelist_files/namelist_defaults_cam.xml
+18 −45 cime_config/testdefs/testlist_cam.xml
+0 −7 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands
+1 −1 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands
+0 −8 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands
+0 −24 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam
+0 −26 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm
+0 −4 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam
+0 −26 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm
+2 −2 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols760/shell_commands
+0 −0 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols760/user_nl_cam
+0 −0 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols760/user_nl_clm
+3 −0 cime_config/usermods_dirs/eworg_opt_clubb/user_nl_cam
+1 −1 components/cdeps
+291 −0 doc/ChangeLog
+2 −0 doc/ChangeLog_template
+190 −137 src/physics/cam/clubb_intr.F90
+90 −74 src/physics/cam/subcol_SILHS.F90
+1 −1 src/physics/clubb
+16 −39 test/system/archive_baseline.sh
+4 −5 test/system/test_driver.sh

0 comments on commit d4df5c3

Please sign in to comment.