Update default FMS to 2023.03 in ac/deps and CI testing#515
Merged
Conversation
Makedep can now exclude prescribed directories in the directory tree used to generate the file lists. This is required for projects which may not follow normal development processes, such as the FMS test programs.
The target (regression) configure step did not use a --with-framework flag and would always build with FMS1, even if FRAMEWORK was set to fms2. This patch adds the flag to its configure step. This patch also does some refactoring of the MOM_ENV and MOM_FCFLAGS setup rules. Values common to all rules are set externally, and additional values for individual rules are appended. Variable syntax also follows Makefile format (spaces around =) rather than POSIX shell (no spaces).
The default FMS build in ac/deps is updated to 2023.03. FMS source now includes a suite of test programs which require explicit preprocessing macros, which can complicate out makedep-based build when those macros are not present. To avoid this, the new "skip" flag has been added to the makedep build. The skip flag should not cause errors or other issues in older versions of FMS which do not have the excluded directory (though perhaps that could or should change in the future).
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #515 +/- ##
============================================
- Coverage 47.12% 37.41% -9.72%
============================================
Files 41 270 +229
Lines 4586 78929 +74343
Branches 807 14684 +13877
============================================
+ Hits 2161 29528 +27367
- Misses 2243 43957 +41714
- Partials 182 5444 +5262 see 264 files with indirect coverage changes 📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today! |
adcroft
approved these changes
Nov 6, 2023
Member
Author
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/21254 ✔️ |
This was referenced Nov 13, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR updates our default FMS to 2023.03 in our autoconf builds, which includes our CI testing used in GitHub Actions.
There is also an upgrade to makedep which excludes directories (using the
-sflag, for "skip"; all other good letters were taken). This was required to removed the programs intest_fmswhich require preprocessor macros. While we could have included them, we don't want to become obliged to maintain a list of required macros.It also fixes a bug in
.testing/Makefilewhich prevented the "target" (or regression) build from using the FMS2 framework API.