Skip to content

Conversation

@marshallward
Copy link
Member

The imminent introduction of the icebergs stub to SIS2, which is not used in our CI tests, can override the libicebergs.a symbols, causing the latter to never be used. This can change answers (among other things).

The glob external/* mkmf pathing is replaced with external/Icepack_interfaces, so that any future icebergs stub will be ignored.

@marshallward
Copy link
Member Author

The CIs above do not use the legacy mkmf builds, and I still don't understand how to properly test the MRS builds, so I can't say for sure if this will actually work. (👉 @adcroft)

@marshallward marshallward requested a review from adcroft December 17, 2025 16:31
@marshallward
Copy link
Member Author

This is meant to fix a regression testing issue discovered by NOAA-GFDL/SIS2#225

@adcroft
Copy link
Member

adcroft commented Dec 17, 2025

Update the Makefiles in ice_ocean_SIS2 and coupled_* too.

The imminent introduction of the icebergs stub to SIS2, which is not
used in our CI tests, can override the libicebergs.a symbols, causing
the latter to never be used.  This can change answers (among other
things).

The glob `external/*` mkmf pathing is replaced with
`external/Icepack_interfaces`, so that any future icebergs stub will be
ignored.
@marshallward marshallward force-pushed the sis2-explicit-externals branch from 0b40787 to 6ca0774 Compare December 17, 2025 18:40
@Hallberg-NOAA
Copy link
Member

This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6-examples/-/pipelines/29605.

Copy link
Member

@adcroft adcroft left a comment

Choose a reason for hiding this comment

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

This looks OK to me but I'd rather do an interactive test of the MOM6 pipeline after #549 is addressed since I'm relying on that in my working directory

@adcroft adcroft merged commit 2e2c33c into NOAA-GFDL:dev/gfdl Dec 22, 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

None yet

Development

Successfully merging this pull request may close these issues.

3 participants