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.

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

Rme/cesm pop 2 1 20240202 #82

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

jedwards4b
Copy link
Collaborator

Description of changes:

This change removes the manage_externals utility and replaces it with git-fleximod. None of the extended features of git-fleximod are used here so one can just use git-submodule instead. This allows POP to be used as part of the upcoming cesm2_3_beta18 tag which removes the manage_externals utility in cesm and moves to git-fleximod.

Testing:

Test case/suite:
Test status: bit for bit

Fixes [POP2 Github issue #]

User interface (namelist or namelist defaults) changes?

Copy link
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

This all looks great, but I'm a little confused about why it works... I did the following:

$ git clone -b remove_manage_externals https://github.com/jedwards4b/POP2-CESM.git POP_rme
$ cd POP_rme/
$ git submodule update --init
$ cd externals/MARBL/
$ git log --decorate | head -n 1
commit 75827e20f40b29a30361aff4eae9801f1036a916 (HEAD, tag: marbl0.43.0)

So it clearly checked out marbl0.43.0, which is the branch of MARBL we want POP to use, but the head of the default branch is 6b2a5e4 (marbl0.39.1). The only reference to a commit I see in .gitmodules is fxtag, which presumably requires fleximod to parse... so how did git know what commit to checkout?

@mnlevy1981
Copy link
Collaborator

ugh, it looks like I actually tested the branch from #80 (had both tabs open); let me close that PR in favor of this one and try again.

@mnlevy1981
Copy link
Collaborator

Okay, I removed the POP_rme directory and tried again:

$ git clone -b rme/cesm_pop_2_1_20240202 https://github.com/jedwards4b/POP2-CESM.git POP_rme --recurse-submodules
Cloning into 'POP_rme'...
remote: Enumerating objects: 13179, done.
remote: Counting objects: 100% (523/523), done.
remote: Compressing objects: 100% (268/268), done.
remote: Total 13179 (delta 264), reused 473 (delta 251), pack-reused 12656
Receiving objects: 100% (13179/13179), 7.16 MiB | 13.85 MiB/s, done.
Resolving deltas: 100% (9491/9491), done.
Submodule 'CVMix' (https://github.com/CVMix/CVMix-src) registered for path 'externals/CVMix'
Submodule 'MARBL' (https://github.com/marbl-ecosys/MARBL) registered for path 'externals/MARBL'
Cloning into '/Users/mlevy/temp/POP_rme/externals/CVMix'...
remote: Enumerating objects: 3334, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 3334 (delta 2), reused 9 (delta 2), pack-reused 3324
Receiving objects: 100% (3334/3334), 5.15 MiB | 13.87 MiB/s, done.
Resolving deltas: 100% (2399/2399), done.
Cloning into '/Users/mlevy/temp/POP_rme/externals/MARBL'...
remote: Enumerating objects: 9808, done.
remote: Counting objects: 100% (1710/1710), done.
remote: Compressing objects: 100% (454/454), done.
remote: Total 9808 (delta 1314), reused 1609 (delta 1241), pack-reused 8098
Receiving objects: 100% (9808/9808), 4.79 MiB | 12.24 MiB/s, done.
Resolving deltas: 100% (7441/7441), done.
Submodule path 'externals/CVMix': checked out '9423197f894112edfcb1502245f7d7b873d551f9'
Submodule path 'externals/MARBL': checked out '75827e20f40b29a30361aff4eae9801f1036a916'

From the last line, you can see it's still checking out the correct MARBL tag (and I'm still curious about how it knows)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants