Skip to content

mom5: remove access-gtracers and type variants #227

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

Merged
merged 2 commits into from
Apr 30, 2025
Merged

mom5: remove access-gtracers and type variants #227

merged 2 commits into from
Apr 30, 2025

Conversation

harshula
Copy link
Collaborator

Closes #183

@aidanheerdegen
Copy link
Member

If you don't mind I'd prefer @dougiesquire and @penguian to review as they're more familiar with the requirements so I think would be better placed to do this.

Copy link
Contributor

@dougiesquire dougiesquire left a comment

Choose a reason for hiding this comment

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

Thanks @harshula. Looks good, but I'll do some testing now.

In the meantime, I think we decided to support building with legacy WOMBAT, which I think requires adding another version:

version branch type access-gtracers
access-om2-bgc-legacy master ACCESS-OM-BGC F

Looking at the MOM5 code, I think supporting this might require code changes since we've moved to spackified gtracers.

ADDED: I think we'll also need to talk about what to do with FMS for this version

@dougiesquire
Copy link
Contributor

support building with legacy WOMBAT, which I think requires adding another version

Thinking about this more, I think perhaps a legacy_BGC variant might be better. I'll play around with this

@harshula
Copy link
Collaborator Author

Hi @aidanheerdegen , Do you still want #183 (comment) ?

@harshula harshula force-pushed the development branch 2 times, most recently from e32b4fa to 4ef72be Compare April 16, 2025 05:20
@harshula harshula force-pushed the development branch 3 times, most recently from d303a35 to 2078d05 Compare April 16, 2025 05:41
@aidanheerdegen
Copy link
Member

Hi @aidanheerdegen , Do you still want #183 (comment) ?

I think what I said still applies, unless there is some new information?

@dougiesquire
Copy link
Contributor

Hi @aidanheerdegen , Do you still want #183 (comment) ?

I think what I said still applies, unless there is some new information?

Oh, I actually misread your original comment @aidanheerdegen. I thought you were saying we should support building with legacy BGC, but now I see you're saying we should only add that if/when someone needs it...

@aidanheerdegen
Copy link
Member

Oh, I actually misread your original comment @aidanheerdegen. I thought you were saying we should support building with legacy BGC, but now I see you're saying we should only add that if/when someone needs it...

Yeah. Now I'm concerned this has created a whole bunch of work ...

@dougiesquire
Copy link
Contributor

Yeah. Now I'm concerned this has created a whole bunch of work ...

In my opinion, I think we're pretty much there. I think I have everything working (currently testing with prereleases and will report back), but @harshula is just working on making the SPR implementation a little better.

@harshula may disagree about how close we are though...

@dougiesquire
Copy link
Contributor

Hi @dougiesquire , You can use spack-packages tag dev-2025.04.002. It only contains changes to the MOM5 SPR.

@harshula, without corresponding changes to the access-esm1p5, access-esm1p6 and access-om2-bgc SPRs, I can only test ACCESS-OM2.

But for ACCESS-OM2, spack-packages dev-2025.04.002 gives the same answers as my test branch as expected:

Model Prerelease PR Configuration test PR Historical reproducibility
ACCESS-OM2 ACCESS-NRI/ACCESS-OM2#102

dev-1deg_jra55_ryf

dougiesquire/1deg_jra55_ryf_wombatlite

❌ see here

❌ see here

Regarding my question from yesterday, are you happy with the string legacy-access-om2-bgc?

It's not ideal, but I guess so... To me, a legacy_bgc variant for the access-om2 version is clearer, but I think you don't like that option? Also, you told me on Zulip that we couldn't assume there is a Spack version specified in the spec. Is that not what you're now doing or am I misunderstanding?

@harshula
Copy link
Collaborator Author

harshula commented Apr 22, 2025

Hi @dougiesquire , There isn't a documented way to extract the version in a consistent way. I had to do a lot of debugging last week and reading source code to discover that the GitVersion class contained a member variable containing the non-git component version string.

@harshula harshula force-pushed the development branch 4 times, most recently from 9ced071 to 8617192 Compare April 23, 2025 03:27
@harshula harshula requested review from dougiesquire and removed request for aidanheerdegen April 23, 2025 04:20
@harshula harshula marked this pull request as ready for review April 23, 2025 04:21
@harshula
Copy link
Collaborator Author

Hi @dougiesquire & @penguian , I've marked this PR Ready for Review. I'm just running build tests of access-om2 at the moment.

@harshula
Copy link
Collaborator Author

Hi @dougiesquire , Completed successful builds of ACCESS-OM2 ([email protected]_2024.08.14=access-om2) and ACCESS-OM-BGC ([email protected]=legacy-access-om2-bgc) in a Docker container.

Can you please do your test runs on spack-packages tag dev-2025.04.004? Thanks!

@dougiesquire
Copy link
Contributor

Testing with:

Model Prerelease PR Configuration test PR Historical reproducibility
ACCESS-OM2 ACCESS-NRI/ACCESS-OM2#102

dev-1deg_jra55_ryf

dougiesquire/1deg_jra55_ryf_wombatlite

❌ see here

❌ see here

ACCESS-OM2-BGC (legacy) ACCESS-NRI/ACCESS-OM2-BGC#22 dev-1deg_jra55_ryf_bgc ✅ see here
ACCESS-ESM1.5 ACCESS-NRI/ACCESS-ESM1.5#35 dev-preindustrial+concentrations ✅ see here
ACCESS-ESM1.6 ACCESS-NRI/ACCESS-ESM1.6#79 dev-preindustrial+concentrations ✅ see here

As above, I think the answer changes to the ACCESS-OM2 configurations are expected.

Copy link
Contributor

@dougiesquire dougiesquire left a comment

Choose a reason for hiding this comment

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

Thanks @harshula, looking good to me. A couple of questions/comments below.

Also, I'm curious about the planned order for merging things. Would it be best to get the following merged before merging this PR:

@harshula
Copy link
Collaborator Author

Also, I'm curious about the planned order for merging things.

This goes first. Then we update relevant MDRs (spack.yaml). Then remaining PRs.

@dougiesquire
Copy link
Contributor

dougiesquire commented Apr 23, 2025

Also, I'm curious about the planned order for merging things.

This goes first. Then we update relevant MDRs (spack.yaml). Then remaining PRs.

Okay, just noting that the changes in this PR won't work by default since they require the changes in the MOM5 development branch. E.g. spack install access-om2 fails.

Is there a reason why we can't merge the MOM5 PR first? Are those changes incompatible with the current MOM5 SPR on main?

@harshula
Copy link
Collaborator Author

Okay, just noting that the changes in this PR won't work by default

Hi @dougiesquire , Which changes in this PR are you referring to?

@dougiesquire
Copy link
Contributor

Okay, just noting that the changes in this PR won't work by default

Hi @dougiesquire , Which changes in this PR are you referring to?

Ah right yeah sorry - the MOM5 SPR already didn't work by default. I.e. even before this PR the MOM5 SPR relied on changes in the MOM5 development branch. Please just ignore me.

harshula and others added 2 commits April 24, 2025 14:19
* The version will determine type and whether gtracers is enabled:

    "access-om2": {"type": "ACCESS-OM", "gtracers": True},
    "legacy-access-om2-bgc": {"type": "ACCESS-OM-BGC", "gtracers": False},
    "access-esm1.5": {"type": "ACCESS-CM", "gtracers": False},
    "access-esm1.6": {"type": "ACCESS-ESM", "gtracers": True},

* Use GitVersion class' ref_version member to extract the version.

* Use explicit versions for clarity. No more "else" case.

* Thanks to Dougie Squire and Paul Leopardi for their help.
@penguian
Copy link
Contributor

Looks OK to me.

Copy link
Contributor

@penguian penguian left a comment

Choose a reason for hiding this comment

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

Approved, as discussed previously.

@harshula harshula merged commit b7c88c7 into main Apr 30, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

Use conditional values for the MOM5 "type" variant.
4 participants