Skip to content

Update MOM6 after https://github.com/mom-ocean/MOM6/pull/1556 is merged#2

Merged
sanAkel merged 2 commits into
developfrom
feature/sanAkel/mom6_pr1556
Mar 22, 2022
Merged

Update MOM6 after https://github.com/mom-ocean/MOM6/pull/1556 is merged#2
sanAkel merged 2 commits into
developfrom
feature/sanAkel/mom6_pr1556

Conversation

@sanAkel
Copy link
Copy Markdown
Contributor

@sanAkel sanAkel commented Mar 22, 2022

This PR originates from GEOS-ESM/GEOSgcm_GridComp. Below is the relevant copy/paste from there:

In order for GEOS-ESM to use MOM6 release geos/v2.0.3 following sequence of steps need to happen in this order:

This PR updates:

PR in GEOSgcm to uptick MOM6 version number to geos/v2.0.3 would need to be added, after this PR is merged.

@mathomp4, @sdrabenh heads up: for known reasons (bugfixes and improvements: changes in default values of parameters, see mom-ocean/MOM6#1556) this code will be non-zero difference (from the way we currently run). Affects only the MOM6 based GEOS AOGCM. I would certainly need your help with above (PR in GEOSgcm). 🙏

@sanAkel sanAkel added non 0-diff dataocean The changes in this pull request are non-zero-diff for amip enhancement New feature or request labels Mar 22, 2022
@sanAkel sanAkel requested a review from mathomp4 March 22, 2022 14:22
@sanAkel sanAkel requested review from a team as code owners March 22, 2022 14:22
@sanAkel sanAkel self-assigned this Mar 22, 2022
yvikhlya
yvikhlya previously approved these changes Mar 22, 2022
@sanAkel sanAkel changed the base branch from main to develop March 22, 2022 14:33
@sanAkel sanAkel dismissed yvikhlya’s stale review March 22, 2022 14:33

The base branch was changed.

Copy link
Copy Markdown
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

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

CMake good.

@mathomp4 mathomp4 added the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Mar 22, 2022
@mathomp4
Copy link
Copy Markdown
Member

Blocking for a second. The CI seems...weird.

Copy link
Copy Markdown
Contributor

@tclune tclune left a comment

Choose a reason for hiding this comment

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

cmake changes ok.

@mathomp4 - I wonder if we should deactivate the cmake team for mom6 as this is now GFDL code?

@mathomp4
Copy link
Copy Markdown
Member

cmake changes ok.

@mathomp4 - I wonder if we should deactivate the cmake team for mom6 as this is now GFDL code?

@tclune No. This is our cmake code for MOM6 (the plugs, gridcomps, cmake, etc.). Though I suppose if we get to a place where we can use MOM's cmake directly, we might be able to remove some...

@mathomp4 mathomp4 removed the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Mar 22, 2022
@mathomp4
Copy link
Copy Markdown
Member

Okay. The CI is failing in the "right" way for this PR. It can never succeed since it's expecting a newer MOM6 version (which will happen on GEOSgcm).

@sanAkel sanAkel merged commit 2ae923b into develop Mar 22, 2022
@sanAkel sanAkel deleted the feature/sanAkel/mom6_pr1556 branch March 22, 2022 14:44
sinakhani pushed a commit that referenced this pull request Jul 14, 2025
* update GEOS-MOM6 cMakeLists.txt to work with the updates proposed in m…

* update defaults
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request non 0-diff dataocean The changes in this pull request are non-zero-diff for amip

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants