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 submodule tags to pass runoff from CISM to ROF as per issue #2590 #2605

Merged
merged 11 commits into from
Jul 22, 2024
Merged

Update submodule tags to pass runoff from CISM to ROF as per issue #2590 #2605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d3e6814
Temporary .gitmodules points to the branches of the modules that changed
slevis-lmwg Jun 20, 2024
540d87f
Update .gitmodules with latest mosart commit
slevis-lmwg Jun 21, 2024
596dc13
Update .gitmodules with new mosart and rtm tags
slevis-lmwg Jun 21, 2024
6dd55ee
Update .gitmodules with new cismwrapper, cmeps, and ccs_config tags
slevis-lmwg Jul 1, 2024
fb95295
Update cismwrapper tag to the correct new one
slevis-lmwg Jul 1, 2024
de1b44c
Ran ./bin/git-fleximod update, so now update the cism module itself
slevis-lmwg Jul 1, 2024
e1b2bda
Correct the tags that I used for ccs_config and cmeps
slevis-lmwg Jul 2, 2024
0524efa
Merge remote-tracking branch 'escomp/master' into update_submodules
slevis-lmwg Jul 19, 2024
63b3c3f
Namelist corrections after an izumi test failed
slevis-lmwg Jul 19, 2024
a32a9eb
Draft ChangeLog/ChangeSum (comments welcome)
slevis-lmwg Jul 20, 2024
a4a9ede
Update ChangeLog/ChangeSum
slevis-lmwg Jul 22, 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
12 changes: 6 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release

[submodule "cism"]
path = components/cism
url = https://github.com/mvertens/CISM-wrapper
fxtag = 34339777afa7b810fd4822fce1039826668b33e4
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_001
slevis-lmwg marked this conversation as resolved.
Show resolved Hide resolved
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper

Expand All @@ -35,8 +35,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/mvertens/ccs_config_cesm.git
fxtag = dbb02c0ccd1492fe278885f8a07a71fa80064319
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm0.0.110
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

Expand All @@ -49,8 +49,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/mvertens/CMEPS.git
fxtag = 4dca7c602e54189b74b1d0195c433d1b83475553
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps0.14.67
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

Expand Down
2 changes: 1 addition & 1 deletion ccs_config
Open in desktop
Submodule ccs_config updated 2 files
+1 −0 machines/cmake_macros/ubuntu-latest.cmake
+71 −0 maps_nuopc.xml
2 changes: 1 addition & 1 deletion components/cism
Open in desktop
Submodule cism updated 7 files
+140 −193 cime_config/config_pes.xml
+581 −0 drivers/cpl/mct/glc_comp_mct.F90
+70 −0 drivers/cpl/mct/glc_cpl_indices.F90
+184 −0 drivers/cpl/mct/glc_import_export.F90
+93 −0 drivers/cpl/mct/history_tape_coupler.F90
+2 −2 drivers/cpl/nuopc/glc_comp_nuopc.F90
+31 −63 drivers/cpl/nuopc/glc_import_export.F90
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated 9 files
+3 −3 cime_config/buildnml
+56 −0 cime_config/config_component.xml
+84 −0 cime_config/namelist_definition_drv.xml
+280 −243 mediator/esmFldsExchange_cesm_mod.F90
+36 −24 mediator/fd_cesm.yaml
+8 −29 mediator/med_diag_mod.F90
+3 −3 mediator/med_internalstate_mod.F90
+12 −12 mediator/med_phases_post_glc_mod.F90
+12 −40 mediator/med_phases_prep_rof_mod.F90
Loading