Open TomasTorsvik opened 1 day ago
@TomasTorsvik, was this on a fresh clone? If not, what was the tree status before you ran the update command?
I cannot reproduce this. Here are my steps:
git clone https://github.com/NorESMhub/NorESM alpha08
cd alpha08
git checkout noresm2_5_alpha08
./bin/git-fleximod update
I performed this sequence successfully on login-3 of Betzy and also on login-2 and my local workstation. git version was 2.45.1
I think this may have been a glitch or a temporary disk issue on login-2 as I cannot reproduce this. Closing. Please re-open if you still have problems?
@gold2718 , @mvertens - CISM is pointing to the ESCOMP repository in the noresm_develop
branch. This should be changed to point to the NorESMhub repository. Or am I missing something?
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_002_noresm_v1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
@TomasTorsvik - so this is one of the real problems with git-fleximod. In my case it didn't find the tag and it just went on. Your suggested fix is correct but we also need to update the submodule correctly for cism.
If I do the following:
$git submodule status
3640d984aad755c2b536abe2ddbcb428cca130ae ccs_config (ccs_config_noresm0.0.38)
f4a63723ead19bf5391abf21e5d49bd3741f7e39 cime (cime6.1.28_noresm_v0)
816981ab062ae466851bd4d239ecf3d912f94011 components/blom (dev1.6.1.5-27-g816981a)
85f35cca4f65927f1a398ccbb0dc2a462b6be4fd components/cam (noresm2_5_016_cam6_4_041)
f6bc97483a1bfb7352c6c5610a13ed898a86990b components/cdeps (cdeps1.0.53)
b0bf4fef4aa944c57c0972b66411882e20d3868d components/cice (cesm_cice6_5_0_20240702_noresm_v2)
41843ef8fed91fcf60e2ea217c4f6f2ee5133c5d components/cism (cismwrap_2_2_005) <=======
ca5cddbcfe543b89e8f9e6b5fb1941b8c8297925 components/clm (ctsm5.3.11-noresm_v1)
1d456df89ce4a1aefe7cf9f5564c53ebe3dab41f components/cmeps (cmeps1.0.20_noresm_v0)
e2ffe00004cc416cfc8bcfae2a949474075c1d1f components/mosart (mosart1.1.02)
4e0ac3d700a151e46a9219ed8773928881e3ba2b components/ww3 (ww3_interface_noresm0.0.15)
82b0071e69d14330b75d23b0bc68543ebea9aadc libraries/mct (MCT_2.11.0)
f52ade075619b32fa141993b5665b0fe099befc2 libraries/parallelio (pio2_5_9-172-gf52ade07)
b26285a01ba00c2c7f31182708827096b1bf93a8 share (share1.1.2_noresm_v0)
-e13f2c61fe6a5136ae1fa034abb5e6973ed40077 tools/statistical_ensemble_test/pyCECT
If I apply your suggested fix - which is to change the .gitmodules at the top level to be
[submodule "cism"]
path = components/cism
url = https://github.com/NorESMhub/CISM-wrapper <====
fxtag = cismwrap_2_2_002_noresm_v1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/CISM-wrapper <====
the the following results:
$ git submodule status
3640d984aad755c2b536abe2ddbcb428cca130ae ccs_config (ccs_config_noresm0.0.38)
f4a63723ead19bf5391abf21e5d49bd3741f7e39 cime (cime6.1.28_noresm_v0)
816981ab062ae466851bd4d239ecf3d912f94011 components/blom (dev1.6.1.5-27-g816981a)
85f35cca4f65927f1a398ccbb0dc2a462b6be4fd components/cam (noresm2_5_016_cam6_4_041)
f6bc97483a1bfb7352c6c5610a13ed898a86990b components/cdeps (cdeps1.0.53)
b0bf4fef4aa944c57c0972b66411882e20d3868d components/cice (cesm_cice6_5_0_20240702_noresm_v2)
+34c8df43e4ab87bf9e8629c48393b73592734753 components/cism (cismwrap_2_2_002_noresm_v1) <=====
ca5cddbcfe543b89e8f9e6b5fb1941b8c8297925 components/clm (ctsm5.3.11-noresm_v1)
1d456df89ce4a1aefe7cf9f5564c53ebe3dab41f components/cmeps (cmeps1.0.20_noresm_v0)
e2ffe00004cc416cfc8bcfae2a949474075c1d1f components/mosart (mosart1.1.02)
4e0ac3d700a151e46a9219ed8773928881e3ba2b components/ww3 (ww3_interface_noresm0.0.15)
82b0071e69d14330b75d23b0bc68543ebea9aadc libraries/mct (MCT_2.11.0)
f52ade075619b32fa141993b5665b0fe099befc2 libraries/parallelio (pio2_5_9-172-gf52ade07)
b26285a01ba00c2c7f31182708827096b1bf93a8 share (share1.1.2_noresm_v0)
-e13f2c61fe6a5136ae1fa034abb5e6973ed40077 tools/statistical_ensemble_test/pyCECT
You will have checked out the right branch BUT it is not consistent with the internal git submodule entry inside the .git directory tree. So that needs to be fixed as well.
@gold2718, @mvdebolskiy and I have talked today about how we want to proceed to with addressing NorESM needs. For now I think we need to work with git-fleximod and understand how to fix things and at the same time work to implement a better solution for our needs.
What we plan to do is to create a noresm2_5_alpha08b tag that has the correct fixes for cism and an updated ChangeLog. @adagj - since you are not using active cism in your compset I think it's fine to use the sandbox you create with noresm2_5_alpha08 for the upcoming simulation.
@mvertens - thanks for the update. It's not a major problem for me, since I'm not running with CISM. It breaks my test script, but I can work around it manually.
Describe the bug Please provide a clear and concise description of what the bug is.
To Reproduce Steps to reproduce the behavior:
Expected behavior After running git-fleximod, I have cism component with git status : HEAD detached at 41843ef