research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cantera]: setting some options at configure time

Browse source
This commit is contained in:
Nicholas Malaya 2012-02-06 23:38:42 +00:00
parent ff3d6f786b
commit bc0cd99602
6 changed files with 55 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cantera/src/thermo/Makefile.am
View file

@ -20,7 +20,7 @@ h_sources = State.h Elements.h Constituents.h Phase.h mix_defs.h \
IdealSolidSolnPhase.h StoichSubstanceSSTP.h \
SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h \
MargulesVPSSTP.h StoichSubstance.h electrolytes.h \
PureFluidPhase.h
PureFluidPhase.h LatticeSolidPhase.h
cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \
ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \
@ -38,10 +38,10 @@ cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \
GibbsExcessVPSSTP.cpp LatticePhase.cpp IdealMolalSoln.cpp \
HMWSoln.cpp HMWSoln_input.cpp WaterSSTP.cpp \
MetalSHEelectrons.cpp \
IdealSolidSolnPhase.cpp \
IdealSolidSolnPhase.cpp LatticeSolidPhase.cpp \
SingleSpeciesTP.cpp MineralEQ3.cpp \
PseudoBinaryVPSSTP.cpp MargulesVPSSTP.cpp \
StoichSubstanceSSTP.cpp PureFluidPhase.cpp
StoichSubstanceSSTP.cpp PureFluidPhase.cpp StoichSubstance.cpp
AM_CPPFLAGS = -I../base
AM_CXXFLAGS = $(AM_CPPFLAGS)

28
config.h.in
View file

@ -51,9 +51,15 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to add string to end of lapack functions */
#undef LAPACK_FTN_STRING_LEN_AT_END
/* Define to add underscore after fortran functions */
#undef LAPACK_FTN_TRAILING_UNDERSCORE
/* Define to lapack functions lowercase */
#undef LAPACK_NAMES_LOWERCASE
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
@ -86,7 +92,23 @@
#undef VERSION
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
#define STRING_LEN_AT_END
#define STORE_MOLE_FRACTIONS
#define INCL_PURE_FLUIDS 1
#define WITH_PURE_FLUIDS 1
#define WITH_LATTICE_SOLID 1
#define WITH_METAL 1
#define WITH_STOICH_SUBSTANCE 1
#define WITH_IDEAL_SOLUTIONS 1
#define WITH_ELECTROLYTES 1
#define HAS_SSTREAM 1
#define CANTERA_DATA "/usr/local/cantera/data"

27
configure.ac
View file

@ -32,12 +32,32 @@ AC_DEFINE([LAPACK_FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after for
LAPACK_FTN_TRAILING_UNDERSCORE=1
AC_DEFINE([FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions])
FTN_TRAILING_UNDERSCORE=1
AC_DEFINE([LAPACK_NAMES_LOWERCASE],1,[Define to lapack functions lowercase])
LAPACK_NAMES_LOWERCASE 1
AC_DEFINE([LAPACK_FTN_STRING_LEN_AT_END],1,[Define to add string to end of lapack functions])
LAPACK_FTN_STRING_LEN_AT_END=1
AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])
AH_BOTTOM([
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
#define STRING_LEN_AT_END
#define STORE_MOLE_FRACTIONS
#define INCL_PURE_FLUIDS 1
#define WITH_PURE_FLUIDS 1
#define WITH_LATTICE_SOLID 1
#define WITH_METAL 1
#define WITH_STOICH_SUBSTANCE 1
#define WITH_IDEAL_SOLUTIONS 1
#define WITH_ELECTROLYTES 1
#define HAS_SSTREAM 1
#define CANTERA_DATA "/usr/local/cantera/data"
])
# ------------------------------
@ -72,6 +92,7 @@ DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs)
AC_OUTPUT(Makefile \
test_problems/Makefile \
test_problems/mixGasTransport/Makefile \
test_problems/ChemEquil_gri_matrix/Makefile \
test_problems/cathermo/Makefile \
test_problems/cathermo/DH_graph_1/Makefile \

2
test_problems/Makefile.am
View file

@ -5,7 +5,7 @@
ChemEquil_ionizedGas ChemEquil_red1 CpJump \
mixGasTransport multiGasTransport printUtilUnitTest
SUBDIRS = cathermo ChemEquil_gri_matrix
SUBDIRS = cathermo mixGasTransport ChemEquil_gri_matrix
#
# would be good to add:
#

2
test_problems/mixGasTransport/Makefile.am
View file

@ -1,6 +1,6 @@
cc_sources = mixGasTransport.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/build/include/ -g
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)

2
test_problems/mixGasTransport/Makefile.in
View file

@ -226,7 +226,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
cc_sources = mixGasTransport.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/build/include/ -g
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport \