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

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2008-02-18 04:04:06 +00:00
parent 8042c12bdb
commit 7b179cb44f
49 changed files with 191 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.cvsignore
View file

@ -14,3 +14,6 @@ linux.my.32
.DS_Store
win32
prepreconfig*
CMakeCache.txt
CMakeFiles
mt.mod

49
CMakeLists.txt
View file

@ -3,46 +3,49 @@ PROJECT (Cantera)
#----------------------------
# user-configurable settings
#----------------------------
INCLUDE (config_cantera.cmake)
INCLUDE (config.cmake)
#operating system
SET(os ${CMAKE_SYSTEM_NAME})
if (os STREQUAL "Darwin")
SET(DARWIN 1)
endif (os STREQUAL "Darwin")
#----------------------------
# Python
#----------------------------
#if (PYTHON_CMD STREQUAL "default")
INCLUDE( FindPythonInterp )
INCLUDE( FindPythonLibs)
SET( PYTHON_EXE ${PYTHON_EXECUTABLE} )
#else (PYTHON_CMD STREQUAL "default")
# SET( PYTHON_EXE ${PYTHON_CMD} )
#endif (PYTHON_CMD STREQUAL "default")
if (PYTHON_CMD STREQUAL "default")
INCLUDE( FindPythonInterp )
SET( PYTHON_EXE ${PYTHON_EXECUTABLE} )
else (PYTHON_CMD STREQUAL "default")
SET( PYTHON_EXE ${PYTHON_CMD} )
endif (PYTHON_CMD STREQUAL "default")
# configuration
#---------------------------------------
# configuration
#---------------------------------------
CONFIGURE_FILE (
${PROJECT_SOURCE_DIR}/config.h_cmake.in
${PROJECT_BINARY_DIR}/config.h )
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera)
#----------------------------------------
# output paths
#----------------------------------------
SET (LIBRARY_OUTPUT_PATH
${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all libraries"
${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all libraries"
)
SET (EXECUTABLE_OUTPUT_PATH
${PROJECT_BINARY_DIR}/build/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all executables"
${PROJECT_BINARY_DIR}/build/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all executables"
)
MARK_AS_ADVANCED (
LIBRARY_OUTPUT_PATH
EXECUTABLE_OUTPUT_PATH
)
LIBRARY_OUTPUT_PATH
EXECUTABLE_OUTPUT_PATH
)
INSTALL_FILES(/include/cantera/kernel FILES config.h)
INSTALL_FILES(/include/cantera FILES config.h)
ADD_SUBDIRECTORY (ext)
ADD_SUBDIRECTORY (Cantera)
SET ( CANTERA_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/Cantera/cxx/include )
#SET(CMAKE_INSTALL_PREFIX /Applications/Cantera/include )
#INSTALL_FILES ( /cantera .h ${CANTERA_CXX_HEADERS} )
SET(CMAKE_INSTALL_PREFIX /Applications/Cantera )
INSTALL_FILES ( /include/cantera .h ${CANTERA_CXX_HEADERS} )

2
Cantera/.cvsignore
View file

@ -1,3 +1,5 @@
Makefile
cads
ECR
CMakeFiles
cmake_install.cmake

13
Cantera/CMakeLists.txt
View file

@ -1,5 +1,16 @@
#-------------------------------------------------
# Build the kernel
#-------------------------------------------------
add_subdirectory(src)
add_subdirectory(cxx)
#-------------------------------------------------
# Build clib
#-------------------------------------------------
add_subdirectory(clib)
#-------------------------------------------------
# Build C++ user interface
#-------------------------------------------------
add_subdirectory(cxx)

7
Cantera/clib/src/CMakeLists.txt
View file

@ -1,6 +1,7 @@
SET (CLIB_SRCS ct.cpp Storage.cpp ctsurf.cpp ctrpath.cpp ctreactor.cpp
ctfunc.cpp ctxml.cpp ctonedim.cpp ctmultiphase.cpp )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/equil)
@ -10,12 +11,8 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/transport)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/converters)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/zeroD)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/oneD)
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera)
#SET (LIBRARY_OUTPUT_PATH
# ${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM
# VERSION} CACHE PATH "Single directory for all libraries"
# )
# INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera)
ADD_LIBRARY ( clib ${CLIB_SRCS} )

4
Cantera/cmake_install.cmake
View file

@ -12,7 +12,7 @@ IF(NOT CMAKE_INSTALL_CONFIG_NAME)
STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
ELSE(BUILD_TYPE)
SET(CMAKE_INSTALL_CONFIG_NAME "")
SET(CMAKE_INSTALL_CONFIG_NAME "Debug")
ENDIF(BUILD_TYPE)
MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME)
@ -30,7 +30,7 @@ ENDIF(NOT CMAKE_INSTALL_COMPONENT)
IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/src/cmake_install.cmake")
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/cmake_install.cmake")
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/clib/cmake_install.cmake")
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/cmake_install.cmake")
ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)

2
Cantera/cxx/.cvsignore
View file

@ -1 +1,3 @@
Makefile
CMakeFiles
cmake_install.cmake

2
Cantera/cxx/CMakeLists.txt
View file

@ -1,2 +1,4 @@
add_subdirectory( include )
add_subdirectory( src )
add_subdirectory( demos )

3
Cantera/cxx/cmake_install.cmake
View file

@ -12,7 +12,7 @@ IF(NOT CMAKE_INSTALL_CONFIG_NAME)
STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
ELSE(BUILD_TYPE)
SET(CMAKE_INSTALL_CONFIG_NAME "")
SET(CMAKE_INSTALL_CONFIG_NAME "Debug")
ENDIF(BUILD_TYPE)
MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME)
@ -29,6 +29,7 @@ ENDIF(NOT CMAKE_INSTALL_COMPONENT)
IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/include/cmake_install.cmake")
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/src/cmake_install.cmake")
INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/demos/cmake_install.cmake")

2
Cantera/cxx/demos/.cvsignore
View file

@ -10,3 +10,5 @@ demos
*.d
.depends
liquidvapor.xml
CMakeFiles
cmake_install.cmake

13
Cantera/cxx/demos/CMakeLists.txt Normal file
View file

@ -0,0 +1,13 @@
SET (COMBUST_SRCS combustor.cpp)
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include)
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR})
ADD_EXECUTABLE(combustor.x ${COMBUST_SRCS})
TARGET_LINK_LIBRARIES ( combustor.x zeroD kinetics thermo ctbase tpx cvode )
ADD_EXECUTABLE(flamespeed.x flamespeed.cpp )
TARGET_LINK_LIBRARIES ( flamespeed.x oneD equil transport kinetics numerics
thermo ctbase tpx ctmath ctlapack ctblas ctf2c )

1
Cantera/cxx/demos/flamespeed.cpp
View file

@ -16,6 +16,7 @@
#include <cantera/transport.h>
using namespace Cantera;
using namespace Cantera_CXX;
int flamespeed(int np, void* p) {
try {

2
Cantera/cxx/include/.cvsignore
View file

@ -1,2 +1,4 @@
Cantera_bt.mak
Cantera.mak
CMakeFiles
cmake_install.cmake

8
Cantera/cxx/include/CMakeLists.txt Normal file
View file

@ -0,0 +1,8 @@
SET(CXX_H Cantera.h equilibrium.h IncompressibleSolid.h
kinetics.h onedim.h surface.h GRI30.h integrators.h
Metal.h PureFluid.h transport.h Edge.h
IdealGasMix.h Interface.h numerics.h
reactionpaths.h zerodim.h importPhase.h thermo.h
radiation.h spectra.h)
INSTALL_FILES(/include/cantera FILES ${CXX_H})

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

@ -7,6 +7,10 @@
#define CANTERA_APP
#endif
namespace Cantera_CXX{ }
using namespace Cantera_CXX;
#include "kernel/ct_defs.h"
// some useful functions

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

@ -22,19 +22,28 @@ namespace Cantera_CXX {
m_ok(false), m_r(0) {
m_r = Cantera::get_XML_File(infile);
m_id = id;
if (id == "-") id = "";
m_ok = Cantera::buildSolutionFromXML(*m_r,
id, "phase", this, this);
m_id, "phase", this, this);
if (!m_ok) throw Cantera::CanteraError("IdealGasMix",
"Cantera::buildSolutionFromXML returned false");
}
IdealGasMix(Cantera::XML_Node& root,
std::string id) : m_ok(false), m_r(0) {
std::string id) : m_ok(false), m_r(&root), m_id(id) {
m_ok = Cantera::buildSolutionFromXML(root, id,
"phase", this, this);
}
IdealGasMix(const IdealGasMix& other) : m_ok(false),
m_r(other.m_r),
m_id(other.m_id) {
m_ok = Cantera::buildSolutionFromXML(*m_r, m_id,
"phase", this, this);
}
virtual ~IdealGasMix() {}
@ -46,9 +55,11 @@ namespace Cantera_CXX {
return s;
}
protected:
bool m_ok;
Cantera::XML_Node* m_r;
std::string m_id;
private:
};

2
Cantera/cxx/src/.cvsignore
View file

@ -2,3 +2,5 @@ Makefile
.depends
SunWS_cache
*.d
CMakeFiles
cmake_install.cmake

4
Cantera/cxx/src/CMakeLists.txt
View file

@ -1,6 +1,6 @@
SET ( CXX_SRCS importPhase.cpp )
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera)
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera/kernel)
ADD_LIBRARY (ctcxx ${CXX_SRCS})

2
Cantera/cxx/src/importPhase.cpp
View file

@ -8,6 +8,8 @@
#include "ThermoFactory.h"
//#include "../include/importPhase.h"
namespace Cantera {}
namespace Cantera_CXX {
Cantera::ThermoPhase* importPhase(std::string infile, std::string id) {

2
Cantera/src/.cvsignore
View file

@ -5,4 +5,6 @@ ctdir.h
config.h
*.d
SunWS_cache
CMakeFiles
cmake_install.cmake

2
Cantera/src/base/.cvsignore
View file

@ -1,3 +1,5 @@
*.d
Makefile
.depends
CMakeFiles
cmake_install.cmake

9
Cantera/src/base/CMakeLists.txt
View file

@ -1,9 +1,12 @@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
SET (CTBASE_SRCS misc.cpp ct2ctml.cpp ctml.cpp
plots.cpp stringUtils.cpp xml.cpp clockWC.cpp)
ADD_LIBRARY(ctbase ${CTBASE_SRCS})
SET (CTBASE_H global.h ct2ctml.h ctml.h
ct_defs.h ctexceptions.h logger.h XML_Writer.h
ctml.h plots.h stringUtils.h xml.h config.h utilities.h
SET (CTBASE_H global.h ctml.h
ct_defs.h ctexceptions.h logger.h XML_Writer.h
ctml.h plots.h stringUtils.h xml.h utilities.h
Array.h vec_functions.h global.h FactoryBase.h clockWC.h )
INSTALL_FILES(/include/cantera/kernel FILES ${CTBASE_H})

1
Cantera/src/equil/CMakeLists.txt
View file

@ -1,6 +1,7 @@
SET (EQUIL_SRCS BasisOptimize.cpp ChemEquil.cpp MultiPhase.cpp MultiPhaseEquil.cpp
equilibrate.cpp )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)

2
Cantera/src/kinetics/.cvsignore
View file

@ -1,3 +1,5 @@
*.d
Makefile
.depends
CMakeFiles
cmake_install.cmake

3
Cantera/src/kinetics/CMakeLists.txt
View file

@ -3,6 +3,7 @@ SET (KINETICS_SRCS importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp
solveSP.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp Group.cpp
ReactionPath.cpp)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
@ -18,4 +19,4 @@ SET(KINETICS_H importKinetics.h GRI_30_Kinetics.h KineticsFactory.h
RxnRates.h Enhanced3BConc.h StoichManager.h solveSP.h InterfaceKinetics.h
ImplicitSurfChem.h EdgeKinetics.h Group.h ReactionPath.h)
INSTALL_FILES(/include/cantera/kernel FILES ${KINETICS_H})
INSTALL_FILES(/cantera/kernel FILES ${KINETICS_H})

2
Cantera/src/numerics/.cvsignore
View file

@ -1,3 +1,5 @@
Makefile
*.d
.depends
CMakeFiles
cmake_install.cmake

5
Cantera/src/numerics/CMakeLists.txt
View file

@ -2,14 +2,15 @@ SET (NUMERICS_SRCS DenseMatrix.cpp funcs.cpp Func1.cpp
ODE_integrators.cpp BandMatrix.cpp DAE_solvers.cpp
sort.cpp )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
ADD_LIBRARY(numerics ${NUMERICS_SRCS})
TARGET_LINK_LIBRARIES (numerics ctbase)
TARGET_LINK_LIBRARIES (numerics ctbase cvode)
SET(NUMERICS_H ArrayViewer.h CVode.h CVodesIntegrator.h DenseMatrix.h
funcs.h ctlapack.h Func1.h FuncEval.h
polyfit.h
BandMatrix.h Integrator.h DAE_Solver.h ResidEval.h sort.h)
INSTALL_FILES(/include/cantera/kernel FILES ${NUMERICS_H})
INSTALL_FILES( /include/cantera/kernel FILES ${NUMERICS_H})

1
Cantera/src/numerics/ODE_integrators.cpp
View file

@ -1,6 +1,7 @@
#include "ct_defs.h"
#include "Integrator.h"
#define NO_SUNDIALS
#ifdef NO_SUNDIALS
#undef HAS_SUNDIALS
#endif

2
Cantera/src/oneD/.cvsignore
View file

@ -2,3 +2,5 @@
Makefile
SunWS_cache
*.d
CMakeFiles
cmake_install.cmake

1
Cantera/src/oneD/CMakeLists.txt
View file

@ -1,6 +1,7 @@
SET (ONED_SRCS MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp
StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)

2
Cantera/src/spectra/.cvsignore
View file

@ -1,3 +1,5 @@
*.d
Makefile
.depends
CMakeFiles
cmake_install.cmake

1
Cantera/src/spectra/CMakeLists.txt
View file

@ -1,5 +1,6 @@
SET (SPECTRA_SRCS rotor.cpp LineBroadener.cpp spectralUtilities.cpp)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)

2
Cantera/src/thermo/.cvsignore
View file

@ -7,3 +7,5 @@ PDSS_Refactor.txt
WaterEps.cpp
WaterEps.h
.*swp
CMakeFiles
cmake_install.cmake

1
Cantera/src/thermo/CMakeLists.txt
View file

@ -7,6 +7,7 @@ SET (THERMO_SRCS State.cpp Elements.cpp Constituents.cpp Phase.cpp
StoichSubstance.cpp PureFluidPhase.cpp LatticeSolidPhase.cpp
LatticePhase.cpp)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
ADD_LIBRARY(thermo ${THERMO_SRCS})

2
Cantera/src/transport/.cvsignore
View file

@ -2,3 +2,5 @@ Makefile
.depends
SunWS_cache
*.d
CMakeFiles
cmake_install.cmake

1
Cantera/src/transport/CMakeLists.txt
View file

@ -1,6 +1,7 @@
SET (TRANSPORT_SRCS TransportFactory.cpp MultiTransport.cpp MixTransport.cpp
MMCollisionInt.cpp SolidTransport.cpp DustyGasTransport.cpp)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)

2
Cantera/src/zeroD/.cvsignore
View file

@ -2,3 +2,5 @@ Makefile
SunWS_cache
.depends
*.d
CMakeFiles
cmake_install.cmake

1
Cantera/src/zeroD/CMakeLists.txt
View file

@ -1,6 +1,7 @@
SET (ZEROD_SRCS Reactor.cpp ReactorBase.cpp FlowDevice.cpp Wall.cpp ReactorNet.cpp
FlowReactor.cpp ConstPressureReactor.cpp ReactorFactory.cpp )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)

14
config.cmake
View file

@ -1,14 +1,16 @@
OPTION(CANTERA_BUILD_FULL_PYTHON "Include support for using Cantera from Python?" ON)
OPTION(CANTERA_BUILD_PYTHON_IFACE "Build the Python user interface?" ON)
OPTION(CANTERA_BUILD_CXX_IFACE "Build the C++ user interface?" ON)
OPTION(CANTERA_BUILD_F90_IFACE "Build the Fortran 90 user interface?" ON)
OPTION(CANTERA_BUILD_CXX_IFACE "Build the Matlab Toolbox?" OFF)
OPTION(CANTERA_BUILD_WITH_F2C "Use f2c versions of 3rd party numerical routines" OFF)
OPTION (CANTERA_BUILD_LAPACK 0)
OPTION (CANTERA_HAVE_SUNDIALS 1)
SET( PYTHON_CMD ${PYTHON_EXE})
# SET(PYTHON_CMD ${PYTHON_EXE})
SET( CANTERA_VERSION "1.7.1")
SET(CANTERA_VERSION "1.7.1")
SET( WITH_PURE_FLUIDS 1 )
@ -18,6 +20,6 @@ SET( WITH_METAL 1 )
SET( WITH_STOICH_SUBSTANCE 1 )
SET ( WITH_IDEAL_SOLUTIONS 1 )
SET( WITH_IDEAL_SOLUTIONS 0 )
SET (WITH_ELECTROLYTES 1 )
SET(WITH_ELECTROLYTES 0 )

22
config_cantera.cmake Normal file
View file

@ -0,0 +1,22 @@
OPTION(BUILD_PYTHON_PACKAGE "Build the Python user interface?" ON)
OPTION(BUILD_CXX_INTERFACE "Build the C++ user interface?" ON)
OPTION(BUILD_F90_INTERFACE "Build the Fortran 90 user interface?" ON)
OPTION(BUILD_MATLAB_TOOLBOX "Build the Matlab Toolbox?" OFF)
OPTION(CANTERA_BUILD_WITH_F2C "Use f2c versions of 3rd party numerical routines" ON)
OPTION (BUILD_LAPACK "Build the lapack library?" 1)
OPTION (HAVE_SUNDIALS "Use Sundials from LLNL?" 0)
# SET(PYTHON_CMD ${PYTHON_EXE})
SET(CANTERA_VERSION "1.7.2")
SET( WITH_PURE_FLUIDS 1 )
SET( WITH_LATTICE_SOLID 1 )
SET( WITH_METAL 1 )
SET( WITH_STOICH_SUBSTANCE 1 )
SET( WITH_IDEAL_SOLUTIONS 0 )
SET(WITH_ELECTROLYTES 0 )

3
ext/.cvsignore
View file

@ -1 +1,4 @@
Makefile
cmake_install.cmake
CMakeFiles
recipes

8
ext/CMakeLists.txt
View file

@ -1,4 +1,12 @@
SET (CMAKE_C_FLAGS -DSkip_f2c_Undefs)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/ext/f2c_libs )
add_subdirectory ( f2c_libs )
add_subdirectory ( f2c_blas )
add_subdirectory ( f2c_lapack )
add_subdirectory ( f2c_math )
add_subdirectory ( cvode )
add_subdirectory ( tpx )

2
ext/cvode/.cvsignore
View file

@ -1 +1,3 @@
Makefile
CMakeFiles
cmake_install.cmake

1
ext/f2c_blas/.cvsignore
View file

@ -1,3 +1,4 @@
*.d
.depends
Makefile
CMakeFiles

1
ext/f2c_blas/CMakeLists.txt
View file

@ -5,6 +5,7 @@ dswap.c dsymm.c dsymv.c dsyr.c dsyr2.c dsyr2k.c dsyrk.c dtbmv.c
dtbsv.c dtpmv.c dtpsv.c dtrmm.c dtrmv.c dtrsm.c dtrsv.c
dzasum.c dznrm2.c idamax.c lsame.c xerbla.c )
INCLUDE_DIRECTORIES ( ${PROJECT_SOURCE_DIR}/ext/f2c_libs )
ADD_LIBRARY(ctblas ${F2C_BLAS_SRCS})

2
ext/f2c_lapack/CMakeLists.txt
View file

@ -1,5 +1,5 @@
SET (F2C_LAPACK_SRCS dgbtrf.c dgbtrs.c dgbsv.c
SET (F2C_LAPACK_SRCS dgbtrf.c dgbtrs.c dgbtf2.c dgbsv.c
dgebd2.c dgebrd.c dgelq2.c dgelqf.c dgelss.c dgeqr2.c dgeqrf.c dgetf2.c
dgetrf.c dgetri.c dgetrs.c dlabad.c dlabrd.c dlacpy.c dlamch.c dlange.c
dlapy2.c dlarf.c dlarfb.c dlarfg.c dlarft.c dlartg.c dlas2.c dlascl.c dlaset.c

4
ext/f2c_libs/.cvsignore
View file

@ -1,4 +1,4 @@
tests
f2ctests
Makefile
arith.h
signal1.h
@ -6,3 +6,5 @@ sysdep1.h
makefile*
arithchk.ilk
f2c_arithchk.pdb
CMakeFiles
CMakeCache.txt

2
ext/f2c_math/.cvsignore
View file

@ -1,3 +1,5 @@
Makefile
.depends
*.d
CMakeFiles
cmake_install.cmake

5
ext/f2c_math/CMakeLists.txt
View file

@ -2,9 +2,8 @@ SET ( CTMATH_SRCS mach.cpp ddaspk.c dgbefa.c dgbsl.c dgefa.c dgesl.c
dp1vlu.c dpcoef.c dpolft.c fdump.c j4save.c pcoef.c polfit.c pvalue.c
xercnt.c xerhlt.c xermsg.c xerprn.c xersve.c xgetua.c printstring.c)
INCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR} )
INCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR}/ext/f2c_libs )
INCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR}/build/include/cantera )
INCLUDE_DIRECTORIES ( ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/ext/f2c_libs )
ADD_LIBRARY( ctmath ${CTMATH_SRCS} )