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

reorganized source tree, changed include files, etc.

Browse source
This commit is contained in:
Dave Goodwin 2007-05-04 15:18:40 +00:00
parent a7e60c5e88
commit fea8c985f5
93 changed files with 405 additions and 380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cantera/clib/src/Makefile.in
View file

@ -41,14 +41,16 @@ EXT_LIBS = -lzeroD -loneD @LOCAL_LIBS@
# the directory where the Cantera libraries are located
CANTERA_LIBDIR=@buildlib@
# ../../../lib
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a \
LIB_DEPS = $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libequil.a \
$(CANTERA_LIBDIR)/libtransport.a \
$(CANTERA_LIBDIR)/libthermo.a \
$(CANTERA_LIBDIR)/libctnumerics.a \
$(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a
# the directory where Cantera include files may be found.
CANTERA_INCDIR=../../src
CXX_INCLUDES = -I$(CANTERA_INCDIR)
CXX_INCLUDES = -I../../src/base -I../../src/thermo -I../../src/kinetics -I../../src/transport -I../../src/numerics -I../../src/oneD -I../../src/zeroD -I../../src/equil -I../../src/converters
# flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @CXXFLAGS@
@ -81,7 +83,7 @@ endif
endif
clean:
$(RM) $(OBJS) $(CTLIB)
$(RM) $(OBJS) $(CTLIB) .depends
(if test -d SunWS_cache ; then \
$(RM) -rf SunWS_cache ; \
fi )

2
Cantera/clib/src/Storage.cpp
View file

@ -10,7 +10,7 @@
// Cantera includes
#include "Kinetics.h"
#include "transport/TransportFactory.h"
#include "TransportFactory.h"
#include "clib_defs.h"
#include "Storage.h"

2
Cantera/clib/src/Storage.h
View file

@ -3,7 +3,7 @@
// Cantera includes
#include "Kinetics.h"
#include "transport/TransportBase.h"
#include "TransportBase.h"
#include "Cabinet.h"
#include "clib_defs.h"

8
Cantera/clib/src/ct.cpp
View file

@ -18,10 +18,12 @@
// Cantera includes
#include "equil.h" //"ChemEquil.h"
#include "KineticsFactory.h"
#include "transport/TransportFactory.h"
#include "TransportFactory.h"
#include "ctml.h"
#include "importCTML.h"
#include "converters/ck2ct.h"
//#include "importCTML.h"
#include "importKinetics.h"
#include "ThermoFactory.h"
#include "ck2ct.h"
#include "Storage.h"
#include "Cabinet.h"
#include "InterfaceKinetics.h"

2
Cantera/clib/src/ct.h
View file

@ -2,7 +2,7 @@
#define CTC_CT_H
#include "clib_defs.h"
#include "../../src/config.h"
#include "cantera/config.h"
extern "C" {

6
Cantera/clib/src/ctonedim.cpp
View file

@ -8,9 +8,9 @@
// Cantera includes
#include "config.h"
#include "oneD/Sim1D.h"
#include "oneD/StFlow.h"
#include "oneD/Inlet1D.h"
#include "Sim1D.h"
#include "StFlow.h"
#include "Inlet1D.h"
#include "DenseMatrix.h"
// local includes

2
Cantera/clib/src/ctonedim.h
View file

@ -2,7 +2,7 @@
#define CTC_ONEDIM_H
#include "clib_defs.h"
#include "../../src/config.h"
#include "cantera/config.h"
extern "C" {

14
Cantera/clib/src/ctreactor.cpp
View file

@ -1,12 +1,12 @@
// Cantera includes
#include "zeroD/Reactor.h"
#include "zeroD/FlowReactor.h"
#include "zeroD/ConstPressureReactor.h"
#include "zeroD/ReactorNet.h"
#include "zeroD/Reservoir.h"
#include "zeroD/Wall.h"
#include "zeroD/flowControllers.h"
#include "Reactor.h"
#include "FlowReactor.h"
#include "ConstPressureReactor.h"
#include "ReactorNet.h"
#include "Reservoir.h"
#include "Wall.h"
#include "flowControllers.h"
#include "Cabinet.h"
#include "Storage.h"

2
Cantera/clib/src/ctxml.cpp
View file

@ -9,7 +9,7 @@
// Cantera includes
#include "ctml.h"
#include "importCTML.h"
//#include "importCTML.h"
#include "Cabinet.h"
#include "Storage.h"

2
Cantera/cxx/demos/Makefile.in
View file

@ -71,7 +71,7 @@ DEPENDS = $(OBJS:.o=.d)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS)
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \
$(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)

2
Cantera/cxx/include/Cantera.h
View file

@ -13,7 +13,7 @@
#include "kernel/ctexceptions.h"
//
#include "kernel/importCTML.h"
//#include "kernel/importCTML.h"
// The Cantera logger class
#include "kernel/logger.h"

2
Cantera/cxx/include/IdealGasMix.h
View file

@ -5,7 +5,7 @@
#include "kernel/IdealGasPhase.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/importKinetics.h"
namespace Cantera {

2
Cantera/cxx/include/Interface.h
View file

@ -5,7 +5,7 @@
#include "kernel/SurfPhase.h"
#include "kernel/InterfaceKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/importKinetics.h"
namespace Cantera {

2
Cantera/cxx/include/PureFluid.h
View file

@ -7,7 +7,7 @@
#include <string>
#include "kernel/PureFluidPhase.h"
#include "kernel/importCTML.h"
#include "kinetics.h"
namespace Cantera {

4
Cantera/cxx/include/kinetics.h
View file

@ -4,8 +4,12 @@
#ifndef CXX_INCL_KINETICS
#define CXX_INCL_KINETICS
#include "thermo.h"
#include "kernel/Kinetics.h"
#include "kernel/InterfaceKinetics.h"
#include "kernel/GasKinetics.h"
#include "kernel/KineticsFactory.h"
#include "kernel/importKinetics.h"
#endif

14
Cantera/cxx/include/onedim.h
View file

@ -1,12 +1,12 @@
#ifndef CT_INCL_ONEDIM_H
#define CT_INCL_ONEDIM_H
#include "kernel/oneD/Sim1D.h"
#include "kernel/oneD/OneDim.h"
#include "kernel/oneD/Domain1D.h"
#include "kernel/oneD/Inlet1D.h"
#include "kernel/oneD/MultiNewton.h"
#include "kernel/oneD/MultiJac.h"
#include "kernel/oneD/StFlow.h"
#include "kernel/Sim1D.h"
#include "kernel/OneDim.h"
#include "kernel/Domain1D.h"
#include "kernel/Inlet1D.h"
#include "kernel/MultiNewton.h"
#include "kernel/MultiJac.h"
#include "kernel/StFlow.h"
#endif

3
Cantera/cxx/include/thermo.h
View file

@ -9,7 +9,6 @@
#ifndef CT_THERMO_INCL
#define CT_THERMO_INCL
#include "kernel/thermo/SingleSpeciesTP.h"
#include "kernel/thermo/StoichSubstanceSSTP.h"
#include "kernel/ThermoFactory.h"
#endif

8
Cantera/cxx/include/transport.h
View file

@ -9,8 +9,8 @@
#ifndef CT_TRANSPORT_INCL
#define CT_TRANSPORT_INCL
#include "kernel/transport/TransportFactory.h"
#include "kernel/transport/DustyGasTransport.h"
#include "kernel/transport/MultiTransport.h"
#include "kernel/transport/MixTransport.h"
#include "kernel/TransportFactory.h"
#include "kernel/DustyGasTransport.h"
#include "kernel/MultiTransport.h"
#include "kernel/MixTransport.h"
#endif

14
Cantera/cxx/include/zerodim.h
View file

@ -1,12 +1,12 @@
#ifndef CT_INCL_ZERODIM_H
#define CT_INCL_ZERODIM_H
#include "kernel/zeroD/Reactor.h"
#include "kernel/zeroD/ReactorNet.h"
#include "kernel/zeroD/Reservoir.h"
#include "kernel/zeroD/Wall.h"
#include "kernel/zeroD/flowControllers.h"
#include "kernel/zeroD/FlowReactor.h"
#include "kernel/zeroD/ConstPressureReactor.h"
#include "kernel/Reactor.h"
#include "kernel/ReactorNet.h"
#include "kernel/Reservoir.h"
#include "kernel/Wall.h"
#include "kernel/flowControllers.h"
#include "kernel/FlowReactor.h"
#include "kernel/ConstPressureReactor.h"
//using namespace CanteraZeroD;

4
Cantera/cxx/src/Makefile.in
View file

@ -23,9 +23,7 @@ DEPENDS = $(OBJS:.o=.d)
CXX = @CXX@
# the directory where Cantera include files may be found.
CANTERA_INCDIR=../../src
CXX_INCLUDES = -I$(CANTERA_INCDIR)
CXX_INCLUDES = -I../../src/base -I../../src/thermo
# how to compile C++ source files to object files
.@CXX_EXT@.@OBJ_EXT@:

15
Cantera/fortran/src/Makefile.in
View file

@ -43,17 +43,18 @@ EXT_LIBS = @LOCAL_LIBS@
# the directory where the Cantera libraries are located
CANTERA_LIBDIR=@buildlib@
# ../../../lib
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libtransport.a
# the directory where Cantera include files may be found.
CANTERA_INCDIR=../../src
LIB_DEPS = $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libequil.a \
$(CANTERA_LIBDIR)/libtransport.a \
$(CANTERA_LIBDIR)/libthermo.a \
$(CANTERA_LIBDIR)/libctnumerics.a \
$(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a
# the directory where module .mod files should be put
MODULE_DIR = @buildinc@/cantera
CXX_INCLUDES = -I$(CANTERA_INCDIR)
CXX_INCLUDES = -I../../src/base -I../../src/thermo -I../../src/kinetics -I../../src/transport -I../../src/numerics -I../../src/oneD -I../../src/zeroD -I../../src/equil -I../../src/converters
# flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @CXXFLAGS@

5
Cantera/fortran/src/fct.cpp
View file

@ -16,9 +16,10 @@
// Cantera includes
#include "equil.h"
#include "KineticsFactory.h"
#include "transport/TransportFactory.h"
#include "TransportFactory.h"
#include "ThermoFactory.h"
#include "ctml.h"
#include "importCTML.h"
#include "importKinetics.h"
//#include "converters/ck2ct.h"
#include "../../clib/src/Storage.h"
#include "../../clib/src/Cabinet.h"

3
Cantera/fortran/src/fctxml.cpp
View file

@ -3,7 +3,8 @@
// Cantera includes
#include "ctml.h"
#include "importCTML.h"
//#include "importCTML.h"
using namespace ctml;
#include "../../clib/src/Cabinet.h"

2
Cantera/fortran/src/flib_defs.h
View file

@ -16,7 +16,7 @@
#define ERR -999
#define DERR -999.999
#include "../../src/config.h"
#include "../../src/base/config.h"
typedef integer status_t;

2
Cantera/matlab/cantera/private/mllogger.h
View file

@ -3,7 +3,7 @@
#include "mex.h"
#include <string>
#include "../../../src/logger.h"
#include "cantera/kernel/logger.h"
#include <iostream>
using namespace std;

2
Cantera/python/Makefile.in
View file

@ -13,7 +13,7 @@ have_python_site_package_topdir=@local_python_inst@
python_site_package_topdir=@python_prefix@
CANTERA_LIBDIR= @buildlib@
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
LIB_DEPS = $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a \
$(CANTERA_LIBDIR)/libtransport.a \
$(CANTERA_LIBDIR)/libclib.a \

10
Cantera/python/setup.py.in
View file

@ -29,7 +29,7 @@ cvlist = cvlibs.split()
thermolib = []
need_cathermo = @NEED_CATHERMO@
if need_cathermo == 1:
thermolib = ["caThermo"]
thermolib = ["thermo"]
extra_link = "@EXTRA_LINK@"
linkargs = extra_link.split()
@ -46,12 +46,12 @@ endlib1 = endlibstr1.replace('-l', ' ')
endlib = endlib1.split()
if platform == "win32":
libs = ["clib", "zeroD","oneD","transport",
"cantera"] + bllist + cvlist + ["ctmath", "tpx"]
libs = ["clib", "zeroD","oneD","kinetics", "transport",
"cantera"] + bllist + cvlist + ["ctbase", "ctmath", "tpx"]
else:
libs = ["clib", "zeroD","oneD","transport",
"cantera", "converters"] + thermolib + bllist + cvlist + ["ctmath", "tpx"]
libs = ["clib", "zeroD","oneD", "kinetics", "transport",
"equil", "ctnumerics", "converters"] + thermolib + bllist + cvlist + ["ctbase", "ctmath", "tpx"]
if @build_with_f2c@ == 1:
libs.append("ctf2c")

2
Cantera/python/src/pycantera.cpp
View file

@ -11,7 +11,7 @@
#pragma warning(disable:4503)
#endif
#include "../../src/config.h"
#include "cantera/config.h"
#include "Python.h"

2
Cantera/python/src/pylogger.h
View file

@ -3,7 +3,7 @@
#include "Python.h"
#include <string>
#include "../../src/logger.h"
#include "cantera/kernel/logger.h"
using namespace std;

2
Cantera/user/Makefile.in
View file

@ -26,7 +26,7 @@ PIC_FLAG=@PIC@
CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT) $(PIC_FLAG)
CXX_INCLUDES = -I../src
CXX_INCLUDES = -I../src/base
LIB = @buildlib@/libuser.a

6
Makefile.in
View file

@ -129,10 +129,6 @@ endif
hdr-collect:
@INSTALL@ -d build/include/cantera
@INSTALL@ -d build/include/cantera/kernel
@INSTALL@ -d build/include/cantera/kernel/oneD
@INSTALL@ -d build/include/cantera/kernel/zeroD
@INSTALL@ -d build/include/cantera/kernel/converters
@INSTALL@ -d build/include/cantera/kernel/transport
@(cd Cantera/cxx/include ; for ihhh in *.h ; do \
../../../$(INSTALL_TSC) $${ihhh} ../../../build/include/cantera ; \
done )
@ -241,7 +237,6 @@ else
endif
example_codes:
(cd examples/cxx; @MAKE@ clean; @MAKE@)
(cd Cantera/cxx/demos; @MAKE@ clean)
(cd Cantera/cxx; @MAKE@)
@ -278,7 +273,6 @@ clean:
cd tools; @MAKE@ clean
cd ext; @MAKE@ clean
cd test_problems; @MAKE@ clean
cd examples; @MAKE@ clean
docs:
cd tools/doxygen/Cantera; doxygen Cantera.cfg

112
configure vendored
View file

@ -308,7 +308,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED PIC CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED PIC CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -2465,8 +2465,8 @@ else
fi
KERNEL='base'
KERNEL_OBJ='$(BASE_OBJ)'
KERNEL=''
KERNEL_OBJ=''
BUILD_CK=
NEED_CKREADER=
@ -2478,10 +2478,10 @@ NEED_F2C=
NEED_CVODE=
NEED_ZEROD=
if test "$ENABLE_THERMO" = "y"; then
KERNEL=$KERNEL' 'thermo;
KERNEL_OBJ=$KERNEL_OBJ' $(THERMO_OBJ)'
fi
#if test "$ENABLE_THERMO" = "y"; then
# KERNEL=$KERNEL' 'thermo;
# KERNEL_OBJ=$KERNEL_OBJ' $(THERMO_OBJ)'
#fi
if test "$WITH_METAL" = "y"; then
cat >>confdefs.h <<\_ACEOF
@ -2551,11 +2551,46 @@ fi
if test "$ENABLE_KINETICS" = "y"; then
KERNEL=$KERNEL' 'kinetics;
KERNEL_OBJ=$KERNEL_OBJ' $(KINETICS_OBJ) $(HETEROKIN_OBJ)'
if test "$WITH_PRIME" = "y"; then
cat >>confdefs.h <<\_ACEOF
#define WITH_PRIME 1
_ACEOF
fi
COMPILE_KINETICS=0
if test "$WITH_KINETICS" = "y"; then
cat >>confdefs.h <<\_ACEOF
#define WITH_KINETICS 1
_ACEOF
COMPILE_KINETICS=1
fi
COMPILE_HETEROKIN=0
if test "$WITH_HETERO_KINETICS" = "y"; then
cat >>confdefs.h <<\_ACEOF
#define WITH_HETEROKINETICS 1
_ACEOF
COMPILE_HETEROKIN=1
fi
COMPILE_RXNPATH=0
if test "$WITH_REACTION_PATHS" = "y"; then
cat >>confdefs.h <<\_ACEOF
#define WITH_REACTIONPATHS 1
_ACEOF
COMPILE_RXNPATH=1
fi
if test "$ENABLE_CK" = "y" ; then
BUILD_CK=1
NEED_CKREADER=1
@ -2587,13 +2622,6 @@ if test "$ENABLE_REACTORS" = "y" ; then
fi
if test "$ENABLE_SOLVERS" = "y" ; then
KERNEL=$KERNEL' 'solvers
KERNEL_OBJ=$KERNEL_OBJ' $(SOLVERS_OBJ)'
NEED_CVODE=1
NEED_MATH=1
fi
NEED_ONED=
if test "$ENABLE_FLOW1D" = "y" ; then
KERNEL=$KERNEL' 'flow1D
@ -2602,13 +2630,6 @@ if test "$ENABLE_FLOW1D" = "y" ; then
NEED_ONED=1
fi
NEED_RXNPATH=
if test "$ENABLE_RXNPATH" = "y" ; then
KERNEL=$KERNEL' 'rpath
KERNEL_OBJ=$KERNEL_OBJ' $(RPATH_OBJ)'
NEED_RXNPATH=1
fi
if test "$ENABLE_TPX" = "y" ; then
KERNEL=$KERNEL' 'tpx
NEED_TPX=1
@ -2659,11 +2680,6 @@ if test "$NEED_CKREADER" = "1" ; then
else
echo " Chemkin File Reader Capability = OFF"
fi
if test "$NEED_RXNPATH" = "1" ; then
echo " Reaction Path Analysis = ON"
else
echo " Reaction Path Analysis = OFF"
fi
if test "$NEED_EQUIL" = "1" ; then
echo " MultiPhase Equilibrium Solver = ON"
else
@ -2679,6 +2695,21 @@ if test "$COMPILE_ELECTROLYTES" = "1" ; then
else
echo " Electrolyte Thermodynamics = OFF"
fi
if test "$COMPILE_KINETICS" = "1" ; then
echo " Homogeneous Kinetics = ON"
else
echo " Homogeneous Kinetics = OFF"
fi
if test "$COMPILE_HETEROKIN" = "1" ; then
echo " Heterogeneous Kinetics = ON"
else
echo " Heterogeneous Kinetics = OFF"
fi
if test "$COMPILE_RXNPATH" = "1" ; then
echo " Reaction Path Analysis = ON"
else
echo " Reaction Path Analysis = OFF"
fi
echo " "
########################################################
@ -2772,20 +2803,28 @@ if test -n "$NEED_ZEROD"
then LOCAL_LIBS=$LOCAL_LIBS' '-lzeroD
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lequil
if test -n "$NEED_CATHERMO"
then LOCAL_LIBS=$LOCAL_LIBS' '-lcaThermo
then LOCAL_LIBS=$LOCAL_LIBS' '-lthermo
fi
if test -n "$COMPILE_KINETICS"
then LOCAL_LIBS=$LOCAL_LIBS' '-lkinetics
fi
if test -n "$NEED_TRANSPORT"
then LOCAL_LIBS=$LOCAL_LIBS' '-ltransport
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lcantera
LOCAL_LIBS=$LOCAL_LIBS' '-lctnumerics
if test -n "$NEED_CVODE"; then
LOCAL_LIBS=$LOCAL_LIBS' '$CVODE_LIBS
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctbase
if test -n "$NEED_LAPACK"
then LOCAL_LIBS=$LOCAL_LIBS' '$BLAS_LAPACK_LIBS
fi
@ -8300,7 +8339,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:8303:" \
echo "$as_me:8342:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -8767,7 +8806,7 @@ fi
ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/user/Makefile Cantera/python/src/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/diamondSurf/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile bin/install_tsc"
ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/base/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/src/kinetics/Makefile Cantera/src/numerics/Makefile Cantera/src/equil/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/user/Makefile Cantera/python/src/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/diamondSurf/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile bin/install_tsc"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
@ -9243,11 +9282,15 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"Cantera/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/Makefile" ;;
"Cantera/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/Makefile" ;;
"Cantera/src/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/base/Makefile" ;;
"Cantera/src/zeroD/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/zeroD/Makefile" ;;
"Cantera/src/oneD/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/oneD/Makefile" ;;
"Cantera/src/converters/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/converters/Makefile" ;;
"Cantera/src/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/transport/Makefile" ;;
"Cantera/src/thermo/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/thermo/Makefile" ;;
"Cantera/src/kinetics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/kinetics/Makefile" ;;
"Cantera/src/numerics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/numerics/Makefile" ;;
"Cantera/src/equil/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/equil/Makefile" ;;
"Cantera/clib/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/clib/src/Makefile" ;;
"Cantera/fortran/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/fortran/src/Makefile" ;;
"Cantera/fortran/f77demos/f77demos.mak" ) CONFIG_FILES="$CONFIG_FILES Cantera/fortran/f77demos/f77demos.mak" ;;
@ -9479,6 +9522,9 @@ s,@phase_header_files@,$phase_header_files,;t t
s,@COMPILE_IDEAL_SOLUTIONS@,$COMPILE_IDEAL_SOLUTIONS,;t t
s,@COMPILE_ELECTROLYTES@,$COMPILE_ELECTROLYTES,;t t
s,@NEED_CATHERMO@,$NEED_CATHERMO,;t t
s,@COMPILE_KINETICS@,$COMPILE_KINETICS,;t t
s,@COMPILE_HETEROKIN@,$COMPILE_HETEROKIN,;t t
s,@COMPILE_RXNPATH@,$COMPILE_RXNPATH,;t t
s,@WITH_REACTORS@,$WITH_REACTORS,;t t
s,@KERNEL@,$KERNEL,;t t
s,@KERNEL_OBJ@,$KERNEL_OBJ,;t t

86
configure.in
View file

@ -393,8 +393,8 @@ else
fi
AC_SUBST(CANTERA_DEBUG_MODE)
KERNEL='base'
KERNEL_OBJ='$(BASE_OBJ)'
KERNEL=''
KERNEL_OBJ=''
BUILD_CK=
NEED_CKREADER=
@ -406,10 +406,10 @@ NEED_F2C=
NEED_CVODE=
NEED_ZEROD=
if test "$ENABLE_THERMO" = "y"; then
KERNEL=$KERNEL' 'thermo;
KERNEL_OBJ=$KERNEL_OBJ' $(THERMO_OBJ)'
fi
#if test "$ENABLE_THERMO" = "y"; then
# KERNEL=$KERNEL' 'thermo;
# KERNEL_OBJ=$KERNEL_OBJ' $(THERMO_OBJ)'
#fi
if test "$WITH_METAL" = "y"; then
AC_DEFINE(WITH_METAL)
@ -466,10 +466,28 @@ if test "$WITH_PRIME" = "y"; then
AC_DEFINE(WITH_PRIME)
fi
if test "$ENABLE_KINETICS" = "y"; then
KERNEL=$KERNEL' 'kinetics;
KERNEL_OBJ=$KERNEL_OBJ' $(KINETICS_OBJ) $(HETEROKIN_OBJ)'
COMPILE_KINETICS=0
if test "$WITH_KINETICS" = "y"; then
AC_DEFINE(WITH_KINETICS)
COMPILE_KINETICS=1
fi
AC_SUBST(COMPILE_KINETICS)
COMPILE_HETEROKIN=0
if test "$WITH_HETERO_KINETICS" = "y"; then
AC_DEFINE(WITH_HETEROKINETICS)
COMPILE_HETEROKIN=1
fi
AC_SUBST(COMPILE_HETEROKIN)
COMPILE_RXNPATH=0
if test "$WITH_REACTION_PATHS" = "y"; then
AC_DEFINE(WITH_REACTIONPATHS)
COMPILE_RXNPATH=1
fi
AC_SUBST(COMPILE_RXNPATH)
if test "$ENABLE_CK" = "y" ; then
BUILD_CK=1
@ -502,13 +520,6 @@ if test "$ENABLE_REACTORS" = "y" ; then
fi
AC_SUBST(WITH_REACTORS)
if test "$ENABLE_SOLVERS" = "y" ; then
KERNEL=$KERNEL' 'solvers
KERNEL_OBJ=$KERNEL_OBJ' $(SOLVERS_OBJ)'
NEED_CVODE=1
NEED_MATH=1
fi
NEED_ONED=
if test "$ENABLE_FLOW1D" = "y" ; then
KERNEL=$KERNEL' 'flow1D
@ -517,13 +528,6 @@ if test "$ENABLE_FLOW1D" = "y" ; then
NEED_ONED=1
fi
NEED_RXNPATH=
if test "$ENABLE_RXNPATH" = "y" ; then
KERNEL=$KERNEL' 'rpath
KERNEL_OBJ=$KERNEL_OBJ' $(RPATH_OBJ)'
NEED_RXNPATH=1
fi
if test "$ENABLE_TPX" = "y" ; then
KERNEL=$KERNEL' 'tpx
NEED_TPX=1
@ -571,11 +575,6 @@ if test "$NEED_CKREADER" = "1" ; then
else
echo " Chemkin File Reader Capability = OFF"
fi
if test "$NEED_RXNPATH" = "1" ; then
echo " Reaction Path Analysis = ON"
else
echo " Reaction Path Analysis = OFF"
fi
if test "$NEED_EQUIL" = "1" ; then
echo " MultiPhase Equilibrium Solver = ON"
else
@ -591,6 +590,21 @@ if test "$COMPILE_ELECTROLYTES" = "1" ; then
else
echo " Electrolyte Thermodynamics = OFF"
fi
if test "$COMPILE_KINETICS" = "1" ; then
echo " Homogeneous Kinetics = ON"
else
echo " Homogeneous Kinetics = OFF"
fi
if test "$COMPILE_HETEROKIN" = "1" ; then
echo " Heterogeneous Kinetics = ON"
else
echo " Heterogeneous Kinetics = OFF"
fi
if test "$COMPILE_RXNPATH" = "1" ; then
echo " Reaction Path Analysis = ON"
else
echo " Reaction Path Analysis = OFF"
fi
echo " "
########################################################
@ -684,20 +698,28 @@ if test -n "$NEED_ZEROD"
then LOCAL_LIBS=$LOCAL_LIBS' '-lzeroD
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lequil
if test -n "$NEED_CATHERMO"
then LOCAL_LIBS=$LOCAL_LIBS' '-lcaThermo
then LOCAL_LIBS=$LOCAL_LIBS' '-lthermo
fi
if test -n "$COMPILE_KINETICS"
then LOCAL_LIBS=$LOCAL_LIBS' '-lkinetics
fi
if test -n "$NEED_TRANSPORT"
then LOCAL_LIBS=$LOCAL_LIBS' '-ltransport
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lcantera
LOCAL_LIBS=$LOCAL_LIBS' '-lctnumerics
if test -n "$NEED_CVODE"; then
LOCAL_LIBS=$LOCAL_LIBS' '$CVODE_LIBS
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctbase
if test -n "$NEED_LAPACK"
then LOCAL_LIBS=$LOCAL_LIBS' '$BLAS_LAPACK_LIBS
fi
@ -1336,11 +1358,15 @@ dnl Checks for library functions.
AC_OUTPUT(Makefile \
Cantera/Makefile \
Cantera/src/Makefile \
Cantera/src/base/Makefile \
Cantera/src/zeroD/Makefile \
Cantera/src/oneD/Makefile \
Cantera/src/converters/Makefile \
Cantera/src/transport/Makefile \
Cantera/src/thermo/Makefile \
Cantera/src/kinetics/Makefile \
Cantera/src/numerics/Makefile \
Cantera/src/equil/Makefile \
Cantera/clib/src/Makefile \
Cantera/fortran/src/Makefile \
Cantera/fortran/f77demos/f77demos.mak \

20
preconfig
View file

@ -210,9 +210,19 @@ WITH_PRIME=${WITH_PRIME:="n"}
# files, or if you run ck2cti on some other machine, you can set this to 'n'.
ENABLE_CK=${ENABLE_CK:='y'}
# homogeneous and heterogeneous kinetics
ENABLE_KINETICS='y'
######################################################################
# Enable homogeneous kinetics
WITH_KINETICS='y'
# Enable heterogeneous kinetics (surface chemistry). This also enables
# charge transfer reactions for electrochemistry.
WITH_HETERO_KINETICS='y'
# Enable reaction path analysis
WITH_REACTION_PATHS='y'
######################################################################
# transport properties
ENABLE_TRANSPORT='y'
@ -408,7 +418,7 @@ CT_SHARED_LIB=${CT_SHARED_LIB:=clib}
RPFONT=${RPFONT:="Helvetica"}
# Don't change this.
CANTERA_VERSION=${CANTERA_VERSION:="1.7.0"}
CANTERA_VERSION=${CANTERA_VERSION:="1.7.1"}
#-----------------------------------------------------------------------
#------------------- don't change anything below!! ---------------------
@ -433,7 +443,9 @@ export CXX_EXT
export CXXFLAGS
export CC
export ENABLE_THERMO
export ENABLE_KINETICS
export WITH_KINETICS
export WITH_HETERO_KINETICS
export WITH_REACTION_PATHS
export ENABLE_TRANSPORT
export ENABLE_CK
export ENABLE_EQUIL

4
test_problems/ChemEquil_gri_matrix/Makefile.in
View file

@ -78,13 +78,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

7
test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
View file

@ -7,16 +7,9 @@
*
*/
#ifdef SRCDIRTREE
#include "ct_defs.h"
#include "ThermoPhase.h"
#include "IdealGasMix.h"
#include "equil.h"
#else
#include "Cantera.h"
#include "IdealGasMix.h"
#include "equilibrium.h"
#endif
using namespace std;
using namespace Cantera;

4
test_problems/ChemEquil_gri_pairs/Makefile.in
View file

@ -78,13 +78,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

4
test_problems/ChemEquil_ionizedGas/Makefile.in
View file

@ -78,13 +78,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

4
test_problems/ChemEquil_red1/Makefile.in
View file

@ -78,14 +78,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/Makefile.in
View file

@ -10,7 +10,7 @@ test_cathermo=@NEED_CATHERMO@
test_pure_fluids=@COMPILE_PURE_FLUIDS@
all:
cd cxx_ex; @MAKE@ all
# cd cxx_ex; @MAKE@ all
cd surfkin; @MAKE@ all
cd fracCoeff; @MAKE@ all
cd negATest; @MAKE@ all
@ -36,7 +36,7 @@ ifeq ($(test_cathermo),1)
endif
test:
@ cd cxx_ex; @MAKE@ -s test
# @ cd cxx_ex; @MAKE@ -s test
@ cd surfkin; @MAKE@ -s test
@ cd fracCoeff; @MAKE@ -s test
@ cd negATest; @MAKE@ -s test
@ -64,7 +64,7 @@ endif
clean:
$(RM) *.*~
cd cxx_ex; @MAKE@ clean
# cd cxx_ex; @MAKE@ clean
cd surfkin; @MAKE@ clean
cd fracCoeff; @MAKE@ clean
cd negATest; @MAKE@ clean
@ -80,7 +80,7 @@ clean:
cd cathermo; @MAKE@ clean
depends:
cd cxx_ex; @MAKE@ depends
# cd cxx_ex; @MAKE@ depends
cd surfkin; @MAKE@ depends
cd fracCoeff; @MAKE@ depends
cd negATest; @MAKE@ depends

6
test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
View file

@ -15,9 +15,9 @@
#include "logger.h"
#include "DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/kernel/thermo/DebyeHuckel.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "kernel/DebyeHuckel.h"
#endif
using namespace std;

8
test_problems/cathermo/DH_graph_1/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = DH_graph_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -81,14 +81,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a .depends
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional dependency to enhance stability
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

6
test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
View file

@ -15,9 +15,9 @@
#include "logger.h"
#include "DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/kernel/thermo/DebyeHuckel.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "kernel/DebyeHuckel.h"
#endif
using namespace std;

8
test_problems/cathermo/DH_graph_NM/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = DH_graph_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a .depends
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

6
test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
View file

@ -15,9 +15,9 @@
#include "logger.h"
#include "DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/kernel/thermo/DebyeHuckel.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "kernel/DebyeHuckel.h"
#endif
using namespace std;

8
test_problems/cathermo/DH_graph_Pitzer/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = DH_graph_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a .depends
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

6
test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
View file

@ -15,9 +15,9 @@
#include "logger.h"
#include "DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/kernel/thermo/DebyeHuckel.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "kernel/DebyeHuckel.h"
#endif
using namespace std;

8
test_problems/cathermo/DH_graph_acommon/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = DH_graph_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a .depends
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

6
test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
View file

@ -15,9 +15,9 @@
#include "logger.h"
#include "DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/kernel/thermo/DebyeHuckel.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "kernel/DebyeHuckel.h"
#endif
using namespace std;

8
test_problems/cathermo/DH_graph_bdotak/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = DH_graph_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a .depends
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
View file

@ -18,13 +18,11 @@
#include "HMWSoln.h"
#include "importCTML.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/thermo.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "thermo.h"
#include "TemperatureTable.h"
#include "ThermoPhase.h"
#include "HMWSoln.h"
#include "importCTML.h"
#endif
using namespace std;

8
test_problems/cathermo/HMW_graph_CpvT/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_graph_CpvT.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends Cp_standalone
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
Cp_standalone: Cp_standalone.o
$(CXX) -o Cp_standalone Cp_standalone.o \

4
test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
View file

@ -16,9 +16,9 @@
#include "HMWSoln.h"
#else
#include "cantera/Cantera.h"
#include "Cantera.h"
#include "cantera/kernel/logger.h"
#include "kernel/logger.h"
#include "HMWSoln.h"
#endif

8
test_problems/cathermo/HMW_graph_GvI/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_graph_GvI.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
View file

@ -19,10 +19,10 @@
#else
#include "ThermoPhase.h"
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/thermo.h"
#include "cantera/kernel/thermo/HMWSoln.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "thermo.h"
#include "kernel/HMWSoln.h"
#endif
#include "TemperatureTable.h"

8
test_problems/cathermo/HMW_graph_GvT/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_graph_GvT.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends Gex_standalone
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
Gex_standalone: Gex_standalone.o

6
test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
View file

@ -18,8 +18,10 @@
#include "HMWSoln.h"
#include "importCTML.h"
#else
#include "cantera/Cantera.h"
#include "cantera/thermo.h"
#include "Cantera.h"
#include "thermo.h"
#include "kernel/HMWSoln.h"
#include "TemperatureTable.h"
#endif
using namespace std;

8
test_problems/cathermo/HMW_graph_HvT/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_graph_HvT.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends L_standalone
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
L_standalone: L_standalone.o

14
test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
View file

@ -16,16 +16,14 @@
#include "HMWSoln.h"
#include "importCTML.h"
#else
#include "vcsc.h"
#include "cantera/Cantera.h"
#include "vcs_Cantera_input.h"
#include "vcs_Cantera_convert.h"
#include "cantera/kernel/logger.h"
#include "cantera/thermo.h"
//#include "vcsc.h"
#include "Cantera.h"
//#include "vcs_Cantera_input.h"
//#include "vcs_Cantera_convert.h"
#include "kernel/logger.h"
#include "thermo.h"
#include "TemperatureTable.h"
#include "ThermoPhase.h"
#include "HMWSoln.h"
#include "importCTML.h"
#endif

8
test_problems/cathermo/HMW_graph_VvT/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_graph_VvT.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends V_standalone
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
V_standalone: V_standalone.o

2
test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
View file

@ -11,7 +11,7 @@
#include "ct_defs.h"
#include "HMWSoln.h"
#else
#include "cantera/Cantera.h"
#include "Cantera.h"
#include "HMWSoln.h"
#endif

8
test_problems/cathermo/HMW_test_1/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_test_1.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -88,14 +88,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

2
test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
View file

@ -11,7 +11,7 @@
#include "ct_defs.h"
#include "HMWSoln.h"
#else
#include "cantera/Cantera.h"
#include "Cantera.h"
#include "HMWSoln.h"
#endif

8
test_problems/cathermo/HMW_test_3/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = HMW_test_3.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: .depends $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

2
test_problems/cathermo/ims/IMSTester.cpp
View file

@ -29,7 +29,7 @@
#include "IdealMolalSoln.h"
#else
#include "Cantera.h"
#include "kernel/thermo/IdealMolalSoln.h"
#include "kernel/IdealMolalSoln.h"
#endif
using namespace std;

8
test_problems/cathermo/ims/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = IMSTester.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

2
test_problems/cathermo/issp/ISSPTester.cpp
View file

@ -29,7 +29,7 @@
#include "IdealSolidSolnPhase.h"
#else
#include "Cantera.h"
#include "kernel/thermo/IdealSolidSolnPhase.h"
#include "kernel/IdealSolidSolnPhase.h"
#endif
using namespace std;

6
test_problems/cathermo/issp/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = ISSPTester.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/cathermo/stoichSubSSTP/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = stoichSubSSTP.o sortAlgorithms.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

9
test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
View file

@ -17,12 +17,9 @@
#include "StoichSubstanceSSTP.h"
#include "importCTML.h"
#else
#include "ThermoPhase.h"
#include "cantera/Cantera.h"
#include "cantera/kernel/logger.h"
#include "cantera/thermo.h"
#include "cantera/kernel/thermo/HMWSoln.h"
#include "Cantera.h"
#include "thermo.h"
#include "kernel/StoichSubstanceSSTP.h"
#endif
#include "TemperatureTable.h"

8
test_problems/cathermo/testIAPWS/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testIAPWSphi.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

8
test_problems/cathermo/testIAPWSPres/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testPress.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/cathermo/testIAPWSTripP/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testTripleP.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

8
test_problems/cathermo/testWaterPDSS/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testWaterPDSS.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies
depends:

8
test_problems/cathermo/testWaterTP/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testWaterSSTP.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

5
test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
View file

@ -3,8 +3,11 @@
*/
#include "stdio.h"
#include "math.h"
#include "Cantera.h"
#include "thermo.h"
#include "WaterSSTP.h"
#include "importCTML.h"
#include <new>
using namespace std;
using namespace Cantera;

6
test_problems/diamondSurf/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = runDiamond.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,13 +80,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target

19
test_problems/diamondSurf/runDiamond.cpp
View file

@ -26,24 +26,9 @@ int iDebug_HKM = 0;
/*****************************************************************/
/*****************************************************************/
#ifdef SRCDIRTREE
#include "ct_defs.h"
#include "ctml.h"
#include "GasKinetics.h"
#include "importCTML.h"
#include "ThermoPhase.h"
#include "InterfaceKinetics.h"
#include "SurfPhase.h"
#else
#include "Cantera.h"
#include "kernel/ct_defs.h"
#include "kernel/ctml.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/ThermoPhase.h"
#include "kernel/InterfaceKinetics.h"
#include "kernel/SurfPhase.h"
#endif
#include "kinetics.h"
using namespace Cantera;

6
test_problems/fracCoeff/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = fracCoeff.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,14 +80,14 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target
depends:

7
test_problems/fracCoeff/fracCoeff.cpp
View file

@ -36,12 +36,7 @@ int iDebug_HKM = 0;
#include "InterfaceKinetics.h"
#else
#include "Cantera.h"
#include "kernel/ct_defs.h"
#include "kernel/ctml.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/ThermoPhase.h"
#include "kernel/InterfaceKinetics.h"
#include "kinetics.h"
#endif
using namespace Cantera;

4
test_problems/min_python/minDiamond/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = runDiamond.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,7 +80,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)

7
test_problems/min_python/minDiamond/runDiamond.cpp
View file

@ -40,12 +40,7 @@ static void printUsage()
#include "InterfaceKinetics.h"
#else
#include "Cantera.h"
#include "kernel/ct_defs.h"
#include "kernel/ctml.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/ThermoPhase.h"
#include "kernel/InterfaceKinetics.h"
#include "kinetics.h"
#endif
using namespace Cantera;

4
test_problems/min_python/negATest/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = negATest.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,7 +80,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)

7
test_problems/min_python/negATest/negATest.cpp
View file

@ -15,12 +15,7 @@
#include "InterfaceKinetics.h"
#else
#include "Cantera.h"
#include "kernel/ct_defs.h"
#include "kernel/ctml.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/ThermoPhase.h"
#include "kernel/InterfaceKinetics.h"
#include "kinetics.h"
#endif
using namespace Cantera;

6
test_problems/negATest/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = negATest.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,13 +80,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target
depends:

16
test_problems/negATest/negATest.cpp
View file

@ -7,22 +7,8 @@
*/
#ifdef SRCDIRTREE
#include "ct_defs.h"
#include "ctml.h"
#include "GasKinetics.h"
#include "importCTML.h"
#include "ThermoPhase.h"
#include "InterfaceKinetics.h"
#else
#include "Cantera.h"
#include "kernel/ct_defs.h"
#include "kernel/ctml.h"
#include "kernel/GasKinetics.h"
#include "kernel/importCTML.h"
#include "kernel/ThermoPhase.h"
#include "kernel/InterfaceKinetics.h"
#endif
#include "kinetics.h"
#include <string>

8
test_problems/pureFluidTest/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = testPureWater.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -80,15 +80,15 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM) .depends
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
$(CANTERA_LIBDIR)/libcaThermo.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libthermo.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

3
test_problems/pureFluidTest/testPureWater.cpp
View file

@ -3,8 +3,7 @@
*/
#include "stdio.h"
#include "math.h"
#include "PureFluidPhase.h"
#include "importCTML.h"
#include "PureFluid.h"
#include <new>
using namespace std;
using namespace Cantera;

6
test_problems/silane_equil/Makefile.in
View file

@ -19,7 +19,7 @@ OBJS = silane_equil.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -78,13 +78,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
# depends target -> forces recalculation of dependencies

6
test_problems/surfkin/Makefile.in
View file

@ -17,7 +17,7 @@ OBJS = surfdemo.o
# Location of the current build. Will assume that tests are run
# in the source directory tree location
src_dir_tree = 1
src_dir_tree = 0
# additional flags to be passed to the linker. If your program
# requires other external libraries, put them here
@ -77,13 +77,13 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libcaThermo.a
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
depends:

6
test_problems/surfkin/surfdemo.cpp
View file

@ -4,15 +4,9 @@
* Sample program that solves an implicit problem for surface
* site fractions.
*/
#ifdef SRCDIRTREE
#include "ct_defs.h"
#include "../silane_equil/IdealGasMix.h"
#include "Interface.h"
#else
#include "Cantera.h"
#include "IdealGasMix.h"
#include "Interface.h"
#endif
using namespace Cantera;
using namespace std;

15
tools/src/Makefile.in
View file

@ -1,7 +1,7 @@
#/bin/sh
LIBDIR = @buildlib@
INCDIR = -I@ctroot@/Cantera/src
INCDIR = -I@ctroot@/Cantera/src/
BINDIR = @buildbin@
build_ck = @BUILD_CK@
@ -16,8 +16,7 @@ OBJS = ck2cti.o cti2ctml.o fixtext.o
DEPENDS = $(OBJS:.o=.d)
CONVLIB_DEP = @buildlib@/libconverters.a
CANTERALIB_DEP = @buildlib@/libcantera.a \
@buildlib@/libctcxx.a
progs = $(BINDIR)/cti2ctml $(BINDIR)/fixtext
ifeq ($(build_ck),1)
@ -27,18 +26,18 @@ exes = $(progs)
endif
.cpp.o:
@CXX@ -c $< @DEFS@ $(INCDIR) @CXXFLAGS@ $(CXX_FLAGS)
@CXX@ -c $< @DEFS@ $(INCDIR)base $(INCDIR)converters @CXXFLAGS@ $(CXX_FLAGS)
all: $(exes)
ck: $(BINDIR)/ck2cti
$(BINDIR)/ck2cti: ck2cti.o $(CONVLIB_DEP) $(CANTERALIB_DEP)
$(BINDIR)/ck2cti: ck2cti.o $(CONVLIB_DEP)
$(RM) $(BINDIR)/ck2cti
@CXX@ -o $(BINDIR)/ck2cti ck2cti.o $(LCXX_FLAGS) \
-lconverters -lcantera -ltpx -lctcxx $(LCXX_END_LIBS)
-lconverters -lctbase -ltpx -lctcxx $(LCXX_END_LIBS)
$(BINDIR)/cti2ctml: cti2ctml.o $(CANTERALIB_DEP)
$(BINDIR)/cti2ctml: cti2ctml.o
$(RM) $(BINDIR)/cti2ctml
@CXX@ -o $(BINDIR)/cti2ctml cti2ctml.o $(LCXX_FLAGS) $(LOCAL_LIBS) \
$(LCXX_END_LIBS)
@ -58,7 +57,7 @@ clean:
fi )
%.d:
@CXX_DEPENDS@ -MM $(INCDIR) @CXXFLAGS@ $(CXX_FLAGS) $*.cpp > $*.d
@CXX_DEPENDS@ $(INCDIR)base $(INCDIR)converters @CXXFLAGS@ $(CXX_FLAGS) $*.cpp > $*.d
depends: $(DEPENDS)
cat *.d &> .depends

2
tools/src/ck2cti.cpp
View file

@ -42,7 +42,7 @@ using namespace std;
#include "ct_defs.h"
#include "global.h"
#include "converters/ck2ct.h"
#include "ck2ct.h"
using namespace Cantera;