Macport issues #1645
Merged
Macport issues #1645
Conversation
This file contains 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
jedwards4b
commented
Jun 6, 2017
| @@ -90,12 +90,7 @@ ifeq ($(USE_ESMF_LIB), TRUE) | |||
| CPPDEFS += -DUSE_ESMF_LIB | |||
| endif | |||
|
|
|||
| # ESMF_INTERFACE is currently only defined in env_build.xml | |||
There was a problem hiding this comment.
This is just a clean-up - there is no longer an ESMF comp_interface
| @@ -351,6 +346,7 @@ else | |||
| endif | |||
| endif | |||
|
|
|||
| COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z) | |||
There was a problem hiding this comment.
COMP_INTERFACE is passed in uppercase, but needs to be lower case in the include path
| @@ -480,16 +480,13 @@ def build_phase(self, sharedlib_only=False, model_only=False): | |||
| """ | |||
| echo Insta pass | |||
| echo SUCCESSFUL TERMINATION > {}/cpl.log.$LID | |||
| cp {}/scripts/tests/cpl.hi1.nc.test {}/{}.cpl.hi.0.nc.base | |||
| cp {}/scripts/tests/cpl.hi1.nc.test {}/{}.cpl.hi.0.nc | |||
There was a problem hiding this comment.
Without this change this test fails in the run phase with
ERROR: copy failed: no hist files found in rundir '/Users/jedwards/projects/scratch/TESTTESTDIFF_P1.f19_g16_rx1.A.elm_gnu.20170606_074337_ml444i/run'
It's not clear to me why it isn't failing on other systems.
jgfouca
approved these changes
Jun 7, 2017
| cp {}/scripts/tests/cpl.hi2.nc.test {}/{}.cpl.hi.0.nc.rest | ||
| """.format(rundir, cimeroot, rundir, case, cimeroot, rundir, case) | ||
| self._set_script(script) | ||
| super(TESTTESTDIFF, self).build_phase(sharedlib_only=sharedlib_only, | ||
| model_only=model_only) | ||
|
|
||
| def run_indv(self, suffix=None, st_archive=False ): |
There was a problem hiding this comment.
@jedwards4b this is probably what caused the copy fail above (this run_indv changed its defaults). Looks like you found a way around it, so this is a good change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Further cleanup and fixes addressing running scripts_regression_tests.py on a mac.
Issue #1644 is an outstanding problem with this port.
Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes
User interface changes?:
Code review: