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

fix issue with case of comp_interface field #1663

Merged
merged 2 commits into from
Jun 8, 2017
Merged

fix issue with case of comp_interface field #1663

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
e4ee831
fix issue with case of comp_interface field
jedwards4b Jun 8, 2017
3115d84
fix pylint issue
jedwards4b Jun 8, 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
1 change: 0 additions & 1 deletion config/acme/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ else
endif
endif

COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)
#===============================================================================
# Set include paths (needed after override for any model specific builds below)
#===============================================================================
Expand Down
2 changes: 0 additions & 2 deletions config/cesm/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ ifeq ($(USE_ESMF_LIB), TRUE)
CPPDEFS += -DUSE_ESMF_LIB
endif

COMP_INTERFACE := $(shell echo $(COMP_INTERFACE) | tr A-Z a-z)

ifeq ($(strip $(MPILIB)),mpi-serial)
CPPDEFS += -DNO_MPI2
else
Expand Down
7 changes: 1 addition & 6 deletions scripts/lib/CIME/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def _build_checks(case, build_threaded, comp_interface, use_esmf_lib,
ninst_value = case.get_value("NINST_VALUE")
smp_build = case.get_value("SMP_BUILD")
build_status = case.get_value("BUILD_STATUS")
expect(comp_interface == "mct", "Only supporting mct comp_interface at this time")

smpstr = ""
inststr = ""
Expand Down Expand Up @@ -189,12 +190,6 @@ def _build_checks(case, build_threaded, comp_interface, use_esmf_lib,
./case.build --clean-all
""")

expect(comp_interface != "ESMF" or use_esmf_lib,
"""
ERROR COMP_INTERFACE IS ESMF BUT USE_ESMF_LIB IS NOT TRUE
SET USE_ESMF_LIB to TRUE with:
./xmlchange -file env_build.xml -id USE_ESMF_LIB -value TRUE
""")

expect(mpilib != "mpi-serial" or not use_esmf_lib,
"""
Expand Down
2 changes: 0 additions & 2 deletions scripts/lib/CIME/test_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,7 @@ def _xml_phase(self, test):

elif opt == 'E':
envtest.set_test_parameter("USE_ESMF_LIB", "TRUE")
envtest.set_test_parameter("COMP_INTERFACE", "ESMF")
logger.debug (" USE_ESMF_LIB set to TRUE")
logger.debug (" COMP_INTERFACE set to ESMF")

elif opt == 'CG':
envtest.set_test_parameter("CALENDAR", "GREGORIAN")
Expand Down
4 changes: 2 additions & 2 deletions src/drivers/mct/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,8 @@

<entry id="COMP_INTERFACE">
<type>char</type>
<valid_values>MCT</valid_values>
<default_value>MCT</default_value>
<valid_values>mct</valid_values>
<default_value>mct</default_value>
<group>build_def</group>
<file>env_build.xml</file>
<desc>use MCT component interface</desc>
Expand Down