Elimination of conflicting external references #9
Conversation
external references at the link step of compilation. They go hand in hand with branches of the same name in mpas-framework and mpas-seaice. The buildlib now has some sed statements that replace a dummy string through the framework files and rename them in the bld/ice/source directory. Module use statements in the ocean source are changed from 'use mpas_...' to 'use mpass_...' to match processing of the framework.
dazlich
requested review from
sherimickelson,
supreethms1809,
gdicker1 and
areanddee
|
Looks like the previous PR slipped a cime_config file in. How do I eliminate it? |
Merge branch 'ew-develop' of https://github.com/EarthWorksOrg/mpas-seaice into HEAD
|
I've got the conflicts worked out, and the prescribe seaice mode changes in the develop branch are now merge in, so review away @gdicker1 @areanddee @sherimickelson @supreethms1809 |
|
See also: EarthWorksOrg/mpas-framework#7 and EarthWorksOrg/mpas-ocean#7 |
I think when I tested merging this PR into ew-develop it resolved itself. I'll make a follow-up PR to add some more things to the .gitignore so files like |
|
Ok, thanks!
On Mar 29, 2024, at 12:32 PM, G. Dylan Dickerson ***@***.***> wrote:
** Caution: EXTERNAL Sender **
Looks like the previous PR slipped a cime_config file in. How do I eliminate it?
I think when I tested merging this PR into ew-develop it resolved itself. I'll make a follow-up PR to add some more things to the .gitignore so files like *.pyc or *.swp don't get included.
—
Reply to this email directly, view it on GitHub<#9 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADS3XWH3G7RV5I2HKPQS2XLY2WXUDAVCNFSM6AAAAABENZ7RWOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAMRXGU4DGNJXGI>.
You are receiving this because you were assigned.Message ID: ***@***.***>
|
There was a problem hiding this comment.
I now think my issue with the term "external reference" in the commit message isn't worth these changes waiting any longer. Without further discussion or thoughts, I plan to merge these PRs and EWOrg/EW #39 later this afternoon.
These modifications allow for the elimination of conflicting external references at the link step of compilation. They go hand in hand with branches of the same name in mpas-framework and mpas-seaice. The buildlib now has some sed statements that replace a dummy string through the framework files and rename them in the bld/ice/source directory. Module use statements in the ocean source are changed from 'use mpas_...' to 'use mpass_...' to match processing of the framework.