209 new build #250

anton-seaice · 2024-12-06T05:30:42Z

Draft of new versions for #209

anton-seaice · 2024-12-06T05:35:22Z

@chrisb13 - we can add the MOM version to this branch too. It doesn't build yet. There is some more to chase down in CESM_share still

(It gives this mysterious error:

 >> 547    /g/data/tm70/as2285/spack0.22/environments/x/access-om3-nuopc/share/CESM_share/src/shr_reprosum_mod.F90:453: undefined reference to `t_barrierf_'
     548    share/libOM3_share.a(shr_reprosum_mod.F90.o): In function `shr_reprosum_mod_mp_shr_reprosum_calc_':
  >> 549    /g/data/tm70/as2285/spack0.22/environments/x/access-om3-nuopc/share/CESM_share/src/shr_reprosum_mod.F90:453: undefined reference to `t_barrierf_'
     550    share/libOM3_share.a(shr_reprosum_mod.F90.o): In function `shr_reprosum_mod_mp_shr_reprosum_calc_':
  >> 551    /g/data/tm70/as2285/spack0.22/environments/x/access-om3-nuopc/share/CESM_share/src/shr_reprosum_mod.F90:453: undefined reference to `t_barrierf_'

)

CDEPS/patches/atm_comp_nuopc.F90.patch

anton-seaice · 2024-12-08T22:26:21Z

If ESCOMP/CESM_share#58 gets merged we can remove the #ifdef TIMING patch again.

anton-seaice · 2024-12-09T00:28:26Z

If ESCOMP/WW3#33 gets merged we can remove the ifdef W3_IC4 patch too

anton-seaice · 2024-12-09T05:23:42Z

I also asked about the wrong variable name in CDEPS here

I moved a newer CDEPS because it's sets a default value for a namelist parameter we don't set, (ESCOMP/CDEPS#315)

MOM6/CMakeLists.txt

anton-seaice · 2025-01-14T05:06:27Z

@aekiss @chrisb13

This is basically ready for review. This change implements new component versions for the model components as follows:

MOM6, using an up to date MOM-ocean version + the generic tracers changes. Access-nri version 2025.01.0
CICE, using CICE6.6.0, plus local changes for MOM supergrid implementation and to fix cice history filenames per Essential diagnostics #190 (comment). Once Make datestamps in pointer filenames configurable ACCESS-NRI/CICE#9 is resolved I will do a release tag.
WW3, dev/unified_0.0.12 from CESM plus a local patch to fix a minor implementation issue with the "IC4_NUMERICS" fix
CDEPS 1.0.59 from CESM
CMEPS 1.0.25 from CESM
CESM_share 1.1.5 from CESM

See individual commits for minor implementation details.

See pre-release deployment:

ACCESS-NRI/ACCESS-OM3#33

and

Draft config update:

ACCESS-NRI/access-om3-configs#154 (comment)

access-hive-bot · 2025-01-14T06:04:02Z

This pull request has been mentioned on ACCESS Hive Community Forum. There might be relevant details there:

https://forum.access-hive.org.au/t/cosima-twg-announce/401/54

access-hive-bot · 2025-01-15T01:37:18Z

This pull request has been mentioned on ACCESS Hive Community Forum. There might be relevant details there:

https://forum.access-hive.org.au/t/cosima-twg-meeting-minutes-2025/4067/2

CDEPS/extra_sources/datm_datamode_jra55do_mod.F90

aekiss

LGTM on a quick look, but I'm too far removed from the nitty-gritty to pick much up. Maybe @dougiesquire could have a look if he's back?

chrisb13

LGTM too, although I'm most familiar with the MOM changes. Small things...

To be clear, I've understood this PR to involve these 3 sets of changes (22 commits), plus model component updates, which would all be accepted/merged at once (correct?):

On a practical point, once everything is merged (assuming you'll do the default GH 'create merge commit'), it's not clear to me how this reference to 209-new-build will work? @micaeljtoliveira tells me the branch name will remain where it is now but the CI may choose to work off the merge commit, which in some cases could be problematic. I see how it's convenient to reference a branch when testing an evolving build but I think now that it's at a release it is safest for this to be changed to a tagged commit. I also think a tagged commit should be used for CICE (perhaps a preliminary one whilst you're awaiting resolution on this).

What is the reason for this failing? I note that the repro check actually uses pr33-12 (not the failing pr33-14). (Although, the symmetric option has been tested elsewhere.) In general, can we please write a brief status when running CI commands such that there's a record of what's changed/why it's being run.

Since @dougiesquire is back on Monday, perhaps we should ask him to have a quick look too?

anton-seaice · 2025-01-17T06:04:39Z

LGTM too, although I'm most familiar with the MOM changes. Small things...

To be clear, I've understood this PR to involve these 3 sets of changes (22 commits), plus model component updates, which would all be accepted/merged at once (correct?):
* [main...209-new-build](https://github.com/COSIMA/access-om3/compare/main...209-new-build)

* [ACCESS-NRI/[email protected]](https://github.com/ACCESS-NRI/ACCESS-OM3/compare/main...209-new-cosima-build-2)

* [ACCESS-NRI/access-om3-configs@dev-1deg_jra55do_ryf...209-dev-1deg_jra55do_ryf](https://github.com/ACCESS-NRI/access-om3-configs/compare/dev-1deg_jra55do_ryf...209-dev-1deg_jra55do_ryf)

Sort of. This PR merges the first one, which i've tried to work into 6 neat commits. The other two are related, but need further updates which are dependent on this update. And then get their own PRs. And another 4 ish PRs for the other config branches in om3-configs.

On a practical point, once everything is merged (assuming you'll do the default GH 'create merge commit'), it's not clear to me how this reference to 209-new-build will work? ...

Yes 209-new-build gets deleted. Ill will do a "release" in this repository, creating an 0.4.0 tag. The 0.4.0 tag then gets used for the deployment repo.

I also think a tagged commit should be used for CICE (perhaps a preliminary one whilst you're awaiting resolution on this).

Ah yep. Ill merge the CICE PR first and update the commit in this PR.

What is the reason for this failing? I note that the repro check actually uses pr33-12 (not the failing pr33-14). (Although, the symmetric option has been tested elsewhere.) In general, can we please write a brief status when running CI commands such that there's a record of what's changed/why it's being run.

I think the PR is marked as failing because the most recent commit triggered build failed. pr33-12 and pr33-14 (the latest one) both passed. I am not sure what happened in between!

Since @dougiesquire is back on Monday, perhaps we should ask him to have a quick look too?

Okie

chrisb13 · 2025-01-17T06:27:58Z

@anton-seaice. Thanks for clarifying, sounds good.

Yes 209-new-build gets deleted. Ill will do a "release" in this repository, creating an 0.4.0 tag. The 0.4.0 tag then gets used for the deployment repo.

Ok, let's have a chat about this next week. Would be good to make sure we're on the same page -- to my mind, the safest option is to make the tag before the merge (is that what you mean?).

anton-seaice · 2025-01-22T04:39:43Z

At the team meeting today - we decided to use patches for MOM6 in this release instead of a commit from a branch.

I've changed MOM6 to pull the latest commit from MOM-ocean, and reverted the patches. The build fails now and I assume that @dougiesquire and or @chrisb13 will fix the patch files in the MOM6/patches folder

patching file /home/runner/work/access-om3/access-om3/build/MOM6/mom_ocean_model_nuopc.F90 (read from /__w/access-om3/access-om3/MOM6/MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90)
Hunk #1 succeeded at 20 (offset 1 line).
Hunk #4 succeeded at 406 with fuzz 2 (offset -3 lines).
Hunk #5 succeeded at 521 (offset -3 lines).
Hunk #6 succeeded at 783 (offset -3 lines).
Hunk #7 succeeded at 814 (offset -4 lines).
Hunk #8 succeeded at 831 (offset -4 lines).
Hunk #9 succeeded at 889 (offset -4 lines).
[ 17%] Generating MOM_PointAccel.F90
cd /home/runner/work/access-om3/access-om3/build/MOM6 && /opt/software/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/cmake-3.24.4-34wqgj6f7jw36cqkvx2nmirahpjzpj65/bin/cmake -Din_file:FILEPATH=/__w/access-om3/access-om3/MOM6/MOM6/src/diagnostics/MOM_PointAccel.F90 -Dpatch_file:FILEPATH=/__w/access-om3/access-om3/MOM6/patches/MOM_PointAccel.F90.patch -Dout_file:FILEPATH=/home/runner/work/access-om3/access-om3/build/MOM6/MOM_PointAccel.F90 -P /__w/access-om3/access-om3/cmake/PatchFile.cmake
'/usr/bin/patch' '/__w/access-om3/access-om3/MOM6/MOM6/src/diagnostics/MOM_PointAccel.F90' '--input=/__w/access-om3/access-om3/MOM6/patches/MOM_PointAccel.F90.patch' '--output=/home/runner/work/access-om3/access-om3/build/MOM6/MOM_PointAccel.F90' '--ignore-whitespace'
patching file /home/runner/work/access-om3/access-om3/build/MOM6/MOM_PointAccel.F90 (read from /__w/access-om3/access-om3/MOM6/MOM6/src/diagnostics/MOM_PointAccel.F90)
Hunk #1 FAILED at 122.
Hunk #2 FAILED at 461.
2 out of 2 hunks FAILED -- saving rejects to file /home/runner/work/access-om3/access-om3/build/MOM6/MOM_PointAccel.F90.rej
CMake Error at /__w/access-om3/access-om3/cmake/PatchFile.cmake:29 (message):
  Failed to apply patch
  /__w/access-om3/access-om3/MOM6/patches/MOM_PointAccel.F90.patch to
  /__w/access-om3/access-om3/MOM6/MOM6/src/diagnostics/MOM_PointAccel.F90
  with /usr/bin/patch

anton-seaice · 2025-01-22T04:44:31Z

It offers me a delete option for the 2025.01.0 Pre-release here of MOM6. Shall I do that?

dougiesquire · 2025-01-22T09:21:34Z

It offers me a delete option for the 2025.01.0 Pre-release here of MOM6. Shall I do that?

Probably yes, but maybe worth holding off until we have a working alternative

dougiesquire · 2025-01-23T03:45:16Z

Okay, okay, I'll get this working locally first 😑...

dougiesquire · 2025-01-23T22:09:55Z

I've redone the patch files for the recent MOM update (now up to date with current mom-ocean/MOM6:main). The MOM6 test suite now passes with these patches applied (bearing in mind that MOM_couplertype_infra.F90.patch needs to be applied to both config_src/infra/FMS1 and config_src/infra/FMS2 for the tests) - see this branch of our MOM6 fork with the patches enabling generic tracers applied.

xref ACCESS-NRI/MOM6#5

dougiesquire

Thanks @anton-seaice et al - looks great! One question, one suggestion.

WW3/patches/w3srcemd.F90.patch

share/CMakeLists.txt

anton-seaice · 2025-01-24T05:06:57Z

Build with todays review changes (redeploy 16):

ACCESS-NRI/ACCESS-OM3#33 (comment)

and the test with MOM6-CICE6:

ACCESS-NRI/access-om3-configs#154 (comment)

I also ran an adhoc test with MOM6-CICE6-WW3 which worked with removal of DEFAULT_2018_ANSWERS = False from MOM_input

…ifdef timing in CESM_share Co-authored-by: Dougie Squire <[email protected]>

…in dshr

…d and rpointer fix CICE 2025.01.0 from access-nri fork

- update patch files for updated MOM6 version - Add new modules to MOM CMakeLists Co-authored-by: Dougie Squire <[email protected]>

anton-seaice · 2025-01-24T05:16:09Z

Ill double check on Tuesday and then merge :-)

anton-seaice assigned chrisb13 and anton-seaice Dec 6, 2024

anton-seaice commented Dec 6, 2024

View reviewed changes

CDEPS/patches/atm_comp_nuopc.F90.patch Outdated Show resolved Hide resolved

anton-seaice force-pushed the 209-new-build branch 3 times, most recently from 660e4d6 to 038cc27 Compare December 13, 2024 02:59

anton-seaice force-pushed the 209-new-build branch 2 times, most recently from 25ec99c to e47ee7c Compare December 20, 2024 00:57

anton-seaice commented Dec 20, 2024

View reviewed changes

MOM6/CMakeLists.txt Outdated Show resolved Hide resolved

This was referenced Jan 14, 2025

Make datestamps in pointer filenames configurable ACCESS-NRI/CICE#9

Merged

Dev access candidate 20241217 ACCESS-NRI/MOM6#3

Closed

anton-seaice force-pushed the 209-new-build branch from d809721 to 6c082da Compare January 14, 2025 05:05

anton-seaice requested a review from aekiss January 14, 2025 05:06

anton-seaice marked this pull request as ready for review January 14, 2025 05:06

anton-seaice mentioned this pull request Jan 16, 2025

Update to use latest OM3 configuration ACCESS-NRI/dev_coupling#51

Open

chrisb13 mentioned this pull request Jan 17, 2025

Switching to Symmetric MOM6 #255

Closed

aekiss reviewed Jan 17, 2025

View reviewed changes

CDEPS/extra_sources/datm_datamode_jra55do_mod.F90 Show resolved Hide resolved

aekiss approved these changes Jan 17, 2025

View reviewed changes

chrisb13 reviewed Jan 17, 2025

View reviewed changes

anton-seaice force-pushed the 209-new-build branch from 6c082da to 785df9f Compare January 22, 2025 04:36

dougiesquire force-pushed the 209-new-build branch from d6c7576 to 403b96a Compare January 23, 2025 06:01

dougiesquire reviewed Jan 24, 2025

View reviewed changes

WW3/patches/w3srcemd.F90.patch Show resolved Hide resolved

share/CMakeLists.txt Outdated Show resolved Hide resolved

dougiesquire approved these changes Jan 24, 2025

View reviewed changes

anton-seaice and others added 5 commits January 24, 2025 16:11

Update CESM share to 1.1.5 and incorporate upstream fix for missing #…

ed9e08b

…ifdef timing in CESM_share Co-authored-by: Dougie Squire <[email protected]>

Update to cmeps1.0.25

dac84a2

Update to CDEPS 1.0.59 and get upstream fix for correct pointer file …

18c160a

…in dshr

Update to CICE 6.6.0 with access-nri branch with reading MOM supergri…

335a4f6

…d and rpointer fix CICE 2025.01.0 from access-nri fork

update to WW3 dev/unified_0.0.12

41ca3be

anton-seaice force-pushed the 209-new-build branch from 2266467 to 6f4670c Compare January 24, 2025 05:14

Update to latest MOM6

f05ae2c

- update patch files for updated MOM6 version - Add new modules to MOM CMakeLists Co-authored-by: Dougie Squire <[email protected]>

anton-seaice force-pushed the 209-new-build branch from 6f4670c to f05ae2c Compare January 24, 2025 05:15

anton-seaice merged commit a5ecf6b into main Jan 28, 2025
2 checks passed

anton-seaice deleted the 209-new-build branch January 28, 2025 22:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

209 new build #250

209 new build #250

anton-seaice commented Dec 6, 2024

anton-seaice commented Dec 6, 2024

anton-seaice commented Dec 8, 2024

anton-seaice commented Dec 9, 2024

anton-seaice commented Dec 9, 2024

anton-seaice commented Jan 14, 2025

access-hive-bot commented Jan 14, 2025

access-hive-bot commented Jan 15, 2025

aekiss left a comment

chrisb13 left a comment

anton-seaice commented Jan 17, 2025

chrisb13 commented Jan 17, 2025

anton-seaice commented Jan 22, 2025 •

edited

Loading

anton-seaice commented Jan 22, 2025 •

edited

Loading

dougiesquire commented Jan 22, 2025

dougiesquire commented Jan 23, 2025

dougiesquire commented Jan 23, 2025

dougiesquire left a comment

anton-seaice commented Jan 24, 2025

anton-seaice commented Jan 24, 2025

209 new build #250

209 new build #250

Conversation

anton-seaice commented Dec 6, 2024

anton-seaice commented Dec 6, 2024

anton-seaice commented Dec 8, 2024

anton-seaice commented Dec 9, 2024

anton-seaice commented Dec 9, 2024

anton-seaice commented Jan 14, 2025

access-hive-bot commented Jan 14, 2025

access-hive-bot commented Jan 15, 2025

aekiss left a comment

Choose a reason for hiding this comment

chrisb13 left a comment

Choose a reason for hiding this comment

anton-seaice commented Jan 17, 2025

chrisb13 commented Jan 17, 2025

anton-seaice commented Jan 22, 2025 • edited Loading

anton-seaice commented Jan 22, 2025 • edited Loading

dougiesquire commented Jan 22, 2025

dougiesquire commented Jan 23, 2025

dougiesquire commented Jan 23, 2025

dougiesquire left a comment

Choose a reason for hiding this comment

anton-seaice commented Jan 24, 2025

anton-seaice commented Jan 24, 2025

anton-seaice commented Jan 22, 2025 •

edited

Loading

anton-seaice commented Jan 22, 2025 •

edited

Loading