Skip to content

Commit

Permalink
Merge remote-tracking branch 'noresmhub/noresm' into feature/megan_ch…
Browse files Browse the repository at this point in the history
…errypick_ctsm_mvertens
  • Loading branch information
mvertens committed Nov 20, 2024
2 parents 594b4a0 + 95a4d93 commit c89f3cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm

[submodule "cime"]
path = cime
url = https://github.com/NorESMhub/cime.git
url = https://github.com/NorESMhub/cime
fxtag = cime6.1.28_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/NorESMhub/cmeps
url = https://github.com/NorESMhub/CMEPS.git
fxtag = cmeps1.0.20_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
Expand All @@ -99,7 +99,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/NorESMHub/NorESM_share
url = https://github.com/NorESMhub/NorESM_share
fxtag = share1.1.2_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
Expand All @@ -116,7 +116,7 @@ fxDONOTUSEurl = https://github.com/MCSclimate/MCT
[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_2
fxtag = pio2_6_3
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
Expand Down
2 changes: 1 addition & 1 deletion libraries/parallelio

0 comments on commit c89f3cc

Please sign in to comment.