*** empty log message ***
This commit is contained in:
parent
6ea7a847ab
commit
323310bffd
10 changed files with 1494 additions and 2881 deletions
|
|
@ -21,7 +21,7 @@ SRCS = cantera/private/ctmethods.cpp \
|
|||
cantera/private/wallmethods.cpp \
|
||||
cantera/private/flowdevicemethods.cpp
|
||||
|
||||
CANTERA_LIBDIR=../../lib
|
||||
CANTERA_LIBDIR=@buildlib@
|
||||
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
|
||||
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#
|
||||
###############################################################
|
||||
|
||||
CANTERA_LIBDIR=../../lib
|
||||
CANTERA_LIBDIR= @buildlib@
|
||||
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
|
||||
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
|
||||
SRCS = src/ctphase_methods.cpp \
|
||||
|
|
|
|||
10
config.h
10
config.h
|
|
@ -9,11 +9,11 @@
|
|||
//------------------------ Fortran settings -------------------//
|
||||
|
||||
|
||||
// define types doublereal, integer, and ftnlen to match the
|
||||
// define types doublereal, integer, and ftnlen to match the
|
||||
// corresponding Fortran data types on your system. The defaults
|
||||
// are OK for most systems
|
||||
|
||||
typedef double doublereal; // Fortran double precision
|
||||
typedef double doublereal; // Fortran double precision
|
||||
typedef int integer; // Fortran integer
|
||||
typedef int ftnlen; // Fortran hidden string length type
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
// adding a hidden argement with the length of the string. Some
|
||||
// compilers add the hidden length argument immediately after the
|
||||
// CHARACTER variable being passed, while others put all of the hidden
|
||||
// length arguments at the end of the argument list. Define this if
|
||||
// length arguments at the end of the argument list. Define this if
|
||||
// the lengths are at the end of the argument list. This is usually the
|
||||
// case for most unix Fortran compilers, but is (by default) false for
|
||||
// Visual Fortran under Windows.
|
||||
|
|
@ -37,7 +37,7 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
//-------- LAPACK / BLAS ---------
|
||||
|
||||
// Define if you are using LAPACK and BLAS from the Intel Math Kernel
|
||||
// Library
|
||||
// Library
|
||||
/* #undef HAVE_INTEL_MKL */
|
||||
|
||||
#define LAPACK_FTN_STRING_LEN_AT_END
|
||||
|
|
@ -45,7 +45,7 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
#define LAPACK_FTN_TRAILING_UNDERSCORE
|
||||
|
||||
|
||||
//--------- Cantera --------------
|
||||
//--------- Cantera --------------
|
||||
|
||||
|
||||
//--------- CKReader -------------
|
||||
|
|
|
|||
4345
config/configure
vendored
4345
config/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -245,6 +245,8 @@ BUILD_PYTHON=0
|
|||
if test -z "$PYTHON_CMD"; then
|
||||
AC_PATH_PROGS(PYTHON_CMD, python2 python, "none")
|
||||
if test "$PYTHON_CMD" != "none"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
|
||||
else
|
||||
BUILD_PYTHON=1
|
||||
fi
|
||||
AC_SUBST(BUILD_PYTHON)
|
||||
#AC_SUBST(PYTHON_CMD)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ LCXX_END_LIBS = @LCXX_END_LIBS@
|
|||
|
||||
|
||||
# the directory where the Cantera libraries are located
|
||||
CANTERA_LIBDIR=@ctroot@/lib
|
||||
CANTERA_LIBDIR=@ctroot@/build/lib
|
||||
|
||||
# required Cantera libraries
|
||||
CANTERA_LIBS =
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ temp_success="1"
|
|||
#################################################################
|
||||
|
||||
CANTERA_BIN=${CANTERA_BIN:=../../bin}
|
||||
$CANTERA_BIN/cxx_examples > cxx_examples.out
|
||||
../../examples/cxx/cxx_examples > cxx_examples.out
|
||||
retnStat=$?
|
||||
if [ $retnStat != "0" ]
|
||||
then
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ EXT_LIBS = @LOCAL_LIBS@
|
|||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||
|
||||
# the directory where the Cantera libraries are located
|
||||
CANTERA_LIBDIR=@ctroot@/lib
|
||||
CANTERA_LIBDIR=@ctroot@/build/lib
|
||||
|
||||
# required Cantera libraries
|
||||
CANTERA_LIBS =
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#/bin/sh
|
||||
|
||||
LIBDIR = @ctroot@/lib
|
||||
LIBDIR = @ctroot@/build/lib
|
||||
INCDIR = -I@ctroot@/Cantera/src
|
||||
BINDIR = @ctroot@/bin
|
||||
build_ck = @BUILD_CK@
|
||||
|
||||
LCXX_FLAGS = -L@ctroot@/lib @CXXFLAGS@
|
||||
LCXX_FLAGS = -L$(LIBDIR) @CXXFLAGS@
|
||||
LOCAL_LIBS = -lcantera @math_libs@ @LAPACK_LIBRARY@ @BLAS_LIBRARY@
|
||||
|
||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#/bin/sh
|
||||
|
||||
LIBDIR = @ctroot@/lib
|
||||
INCDIR = @prefix@/include/cantera
|
||||
LIBDIR = @ctroot@/build/lib
|
||||
INCDIR = @ctroot@/build/include/cantera
|
||||
BINDIR = @ctroot@/bin
|
||||
build_ck = @BUILD_CK@
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue