Skip to content
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

Fix LILAC build with user-defined machine with latest CIME #1571

Merged
merged 3 commits into from
Dec 13, 2021

Conversation

billsacks
Copy link
Member

Description of changes

With recent versions of CIME, the LILAC build with a user-defined machine was broken for a couple of reasons. This PR fixes it.

Specific notes

Contributors other than yourself, if any:

CTSM Issues Fixed (include github issue #):

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)? No

Testing performed, if any:

  • python testing
  • LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.cheyenne_intel.clm-lilac - passes and bit-for-bit with baselines
  • manual testing of the lilac build with a user-defined machine

ESMF_LIBDIR is deprecated; the preferred method for specifying the path
to ESMF is now to use ESMFMKFILE. And the latter is needed for a check
in the CMEPS buildnml; see also
ESCOMP#1498
config_compilers.xml is deprecated; need a cmake macros file instead.

Resolves ESCOMP#1492
@billsacks billsacks self-assigned this Dec 7, 2021
@billsacks
Copy link
Member Author

I don't feel this needs a review.

Since the files it touches are very limited, pretty clearly only impacting LILAC, I feel like it can come to master with only minimal testing. We can discuss briefly on Thursday.

@billsacks billsacks added the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Dec 7, 2021
@billsacks billsacks removed the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Dec 9, 2021
@ekluzek ekluzek merged commit 9c4c0d6 into ESCOMP:master Dec 13, 2021
@billsacks billsacks deleted the lilac_fix_userdefined branch December 13, 2021 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done (non release/external)
Development

Successfully merging this pull request may close these issues.

Need to update LILAC build process to use cmake macros instead of config_compilers.xml
2 participants