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

Config build #828

Merged
merged 20 commits into from
Dec 7, 2016
Merged

Config build #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cc0b9ba
restructuring code
jedwards4b Nov 19, 2016
311f78a
mv build to BuildTools
jedwards4b Nov 20, 2016
44d1d2d
improve configure program flow
jedwards4b Nov 21, 2016
b450b10
move into CIME
jedwards4b Nov 21, 2016
450c6e3
merge build into compilers
jedwards4b Nov 21, 2016
999ca40
fix tests
jedwards4b Nov 22, 2016
a4e0e0c
fix unit tests
jedwards4b Nov 22, 2016
f117402
rearrange some files
jedwards4b Nov 22, 2016
d39d236
file cleanup
jedwards4b Nov 23, 2016
0414f47
update for theta
jedwards4b Nov 23, 2016
7de9f18
rename corip1 cori-haswell
jedwards4b Nov 23, 2016
0195917
save this change for another PR
jedwards4b Nov 23, 2016
886720f
update for NAG
jedwards4b Nov 28, 2016
be40065
fix issue in mct configure
jedwards4b Nov 28, 2016
bec57d1
remove whitespace difference
jedwards4b Nov 28, 2016
c925d41
fix include file name
jedwards4b Nov 28, 2016
d042b1c
changes for cori-knl
jedwards4b Nov 29, 2016
c940582
updates for cori-knl
jedwards4b Dec 3, 2016
a1a46fe
MP_MPILIB over defined
jedwards4b Dec 4, 2016
c088677
always code_check file if full path provided
jedwards4b Dec 7, 2016
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
9 changes: 1 addition & 8 deletions cime_config/acme/config_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<group>case_last</group>
<file>env_case.xml</file>
<desc>file containing compiler specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
<schema>$CIMEROOT/cime_config/xml_schemas/config_compilers_v2.xsd</schema>
</entry>

<entry id="MACHINES_SPEC_FILE">
Expand All @@ -48,14 +49,6 @@
<desc>file containing machine specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
</entry>

<entry id="BUILD_SPEC_FILE">
<type>char</type>
<default_value>$CIMEROOT/cime_config/$MODEL/machines/config_build.xml</default_value>
<group>case_last</group>
<file>env_case.xml</file>
<desc>file containing build specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
</entry>

<entry id="PIO_SPEC_FILE">
<type>char</type>
<default_value>$CIMEROOT/cime_config/$MODEL/machines/config_pio.xml</default_value>
Expand Down
4 changes: 2 additions & 2 deletions cime_config/acme/machines/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ ifeq (,$(SHAREDPATH))
INSTALL_SHAREDPATH = $(EXEROOT)/$(SHAREDPATH)
endif

include $(CASEROOT)/Macros
include $(CASEROOT)/Macros.make
# Decide whether to use a C++ or Fortran linker, based on whether we
# are using any C++ code and the compiler-dependent CXX_LINKER variable
ifeq ($(USE_CXX), true)
Expand Down Expand Up @@ -399,7 +399,7 @@ INCLDIR += -I$(INSTALL_SHAREDPATH)/include -I$(CIMEROOT)/share/csm_share/shr \
CFLAGS+=$(CPPDEFS)
CXXFLAGS := $(CFLAGS)

CONFIG_ARGS += CC="$(SCC)" FC="$(SFC)" MPICC="$(MPICC)" \
CONFIG_ARGS += CC="$(CC)" FC="$(FC)" MPICC="$(MPICC)" \
MPIFC="$(MPIFC)" FCFLAGS="$(FFLAGS) $(FREEFLAGS) $(INCLDIR)" \
CPPDEFS="$(CPPDEFS)" CFLAGS="$(CFLAGS) -I.. $(INCLDIR)" \
NETCDF_PATH=$(NETCDF_PATH) LDFLAGS="$(LDFLAGS)"
Expand Down
Loading