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.

Sign up for GitHub

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

Jump to bottom

Macport issues #1645

Merged
merged 2 commits into from
Jun 7, 2017
Merged

Macport issues #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49c3bf2
fix pylint issues
jedwards4b Jun 5, 2017
c3c2381
fix TESTTESTDIFF and Makefile issue
jedwards4b Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions config/acme/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,7 @@ ifeq ($(USE_ESMF_LIB), TRUE)
CPPDEFS += -DUSE_ESMF_LIB
endif

# ESMF_INTERFACE is currently only defined in env_build.xml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is just a clean-up - there is no longer an ESMF comp_interface

ifeq ($(COMP_INTERFACE), ESMF)
CPPDEFS += -DESMF_INTERFACE
else
CPPDEFS += -DMCT_INTERFACE
endif
CPPDEFS += -DMCT_INTERFACE

ifeq ($(strip $(MPILIB)),mpi-serial)
CPPDEFS += -DNO_MPI2
Expand Down Expand Up @@ -351,6 +346,7 @@ else
endif
endif

COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

COMP_INTERFACE is passed in uppercase, but needs to be lower case in the include path

#===============================================================================
# Set include paths (needed after override for any model specific builds below)
#===============================================================================
Expand Down
7 changes: 1 addition & 6 deletions config/cesm/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,7 @@ ifeq ($(USE_ESMF_LIB), TRUE)
CPPDEFS += -DUSE_ESMF_LIB
endif

# ESMF_INTERFACE is currently only defined in env_build.xml
ifeq ($(COMP_INTERFACE), ESMF)
CPPDEFS += -DESMF_INTERFACE
else
CPPDEFS += -DMCT_INTERFACE
endif
COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)

ifeq ($(strip $(MPILIB)),mpi-serial)
CPPDEFS += -DNO_MPI2
Expand Down
5 changes: 1 addition & 4 deletions scripts/lib/CIME/SystemTests/system_tests_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

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 ):
Copy link
Contributor

Choose a reason for hiding this comment

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

@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.

super(TESTTESTDIFF,self).run_indv(suffix, st_archive)

def run_phase(self):
super(TESTTESTDIFF, self).run_phase()
self._component_compare_test("base", "rest")
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/CIME/XML/machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def set_machine(self, machine):
self.machine = machine

return machine

#pylint: disable=arguments-differ
def get_value(self, name, attributes=None, resolved=True, subgroup=None):
"""
Get Value of fields in the config_machines.xml file
Expand Down