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 an issue with nag debug and add ARCHIVE_SPEC_FILE to acme config_… #1188

Merged
merged 1 commit into from
Feb 27, 2017
Merged

fix an issue with nag debug and add ARCHIVE_SPEC_FILE to acme config_… #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions cime_config/acme/config_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,30 @@
<desc>file containing specification of all pe-layouts for primary component (for documentation only - DO NOT EDIT)</desc>
<schema>$CIMEROOT/cime_config/xml_schemas/config_pes.xsd</schema>
</entry>
<entry id="ARCHIVE_SPEC_FILE">
<type>char</type>
<values>
<value>$CIMEROOT/cime_config/acme/config_archive.xml</value>
<value component="cpl" >$CIMEROOT/driver_cpl/cime_config/config_archive.xml</value>
<!-- data model components -->
<value component="drof">$CIMEROOT/components/data_comps/drof/cime_config/config_archive.xml</value>
<value component="datm">$CIMEROOT/components/data_comps/datm/cime_config/config_archive.xml</value>
<value component="dice">$CIMEROOT/components/data_comps/dice/cime_config/config_archive.xml</value>
<value component="dlnd">$CIMEROOT/components/data_comps/dlnd/cime_config/config_archive.xml</value>
<value component="docn">$CIMEROOT/components/data_comps/docn/cime_config/config_archive.xml</value>
<value component="dwav">$CIMEROOT/components/data_comps/dwav/cime_config/config_archive.xml</value>
<!-- external model components -->
<!-- <value component="cam" >$SRCROOT/components/cam/cime_config/config_archive.xml</value>
<value component="cism" >$SRCROOT/components/cism/cime_config/config_archive.xml</value>
<value component="clm" >$SRCROOT/components/clm/cime_config/config_archive.xml</value>
<value component="cice" >$SRCROOT/components/cice/cime_config/config_archive.xml</value>
<value component="pop" >$SRCROOT/components/pop/cime_config/config_archive.xml</value> -->
</values>
<group>case_last</group>
<file>env_case.xml</file>
<desc>file containing specification of archive files for each component (for documentation only - DO NOT EDIT)</desc>
<schema>$CIMEROOT/cime_config/xml_schemas/config_archive.xsd</schema>
</entry>

<entry id="SYSTEM_TESTS_DIR">
<type>char</type>
Expand Down
61 changes: 31 additions & 30 deletions cime_config/cesm/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,35 @@ endif

INCLDIR += -I$(INSTALL_SHAREDPATH)/include -I$(CIMEROOT)/share/csm_share/shr \
-I$(CIMEROOT)/share/csm_share/include -I$(CIMEROOT)/share/shr_RandNum/include

ifeq ($(MODEL),driver)
INCLDIR += -I$(EXEROOT)/atm/obj -I$(EXEROOT)/ice/obj -I$(EXEROOT)/ocn/obj -I$(EXEROOT)/glc/obj -I$(EXEROOT)/rof/obj -I$(EXEROOT)/wav/obj -I$(EXEROOT)/esp/obj
# nagfor and gcc have incompatible LDFLAGS.
# nagfor requires the weird "-Wl,-Wl,," syntax.
# If done in config_compilers.xml, we break MCT.
ifeq ($(strip $(COMPILER)),nag)
ifeq ($(NETCDF_SEPARATE), false)
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_PATH)/lib
else ifeq ($(NETCDF_SEPARATE), true)
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_C_PATH)/lib
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_FORTRAN_PATH)/lib
endif
endif
else
ifeq ($(strip $(COMPILER)),nag)
ifeq ($(DEBUG), TRUE)
ifeq ($(strip $(MACH)),hobart)
# GCC needs to be able to link to
# nagfor runtime to get autoconf
# tests to work.
CFLAGS += -Wl,--as-needed,--allow-shlib-undefined
SLIBS += -L$(COMPILER_PATH)/lib/NAG_Fortran -lf60rts
endif
endif
endif
endif


#
# Use the MCT dir for the cache for all configure calls because it is the first one
#
Expand All @@ -389,8 +418,8 @@ FFLAGS_NOOPT += $(FPPDEFS)


ifeq ($(findstring -cosp,$(CAM_CONFIG_OPTS)),-cosp)
# The following is for the COSP simulator code:
COSP_LIBDIR:=$(EXEROOT)/atm/obj/cosp
# The following is for the COSP simulator code:
COSP_LIBDIR:=$(EXEROOT)/atm/obj/cosp
endif

ifeq ($(MODEL),cam)
Expand Down Expand Up @@ -433,34 +462,6 @@ else ifeq ($(NETCDF_SEPARATE), true)
SLIBS += -L$(LIB_NETCDF_FORTRAN) -L$(LIB_NETCDF_C) -lnetcdff -lnetcdf
endif


ifeq ($(MODEL),driver)
INCLDIR += -I$(EXEROOT)/atm/obj -I$(EXEROOT)/ice/obj -I$(EXEROOT)/ocn/obj -I$(EXEROOT)/glc/obj -I$(EXEROOT)/rof/obj -I$(EXEROOT)/wav/obj -I$(EXEROOT)/esp/obj
# nagfor and gcc have incompatible LDFLAGS.
# nagfor requires the weird "-Wl,-Wl,," syntax.
# If done in config_compilers.xml, we break MCT.
ifeq ($(strip $(COMPILER)),nag)
ifeq ($(NETCDF_SEPARATE), false)
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_PATH)/lib
else ifeq ($(NETCDF_SEPARATE), true)
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_C_PATH)/lib
SLIBS += -Wl,-Wl,,-rpath=$(NETCDF_FORTRAN_PATH)/lib
endif
endif
else
ifeq ($(strip $(COMPILER)),nag)
ifeq ($(DEBUG), TRUE)
ifeq ($(strip $(MACH)),hobart)
# GCC needs to be able to link to
# nagfor runtime to get autoconf
# tests to work.
CFLAGS += -Wl,--as-needed,--allow-shlib-undefined
SLIBS += -L$(COMPILER_PATH)/lib/NAG_Fortran -lf60rts
endif
endif
endif
endif

ifdef LIB_PNETCDF
SLIBS += -L$(LIB_PNETCDF) -lpnetcdf
endif
Expand Down