diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 915661c8d..000000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -PROJECT (Cantera) - -#---------------------------- -# user-configurable settings -#---------------------------- -INCLUDE (config_cantera.cmake) - - -#---------------------------- -# 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") - - -#--------------------------------------- -# configuration -#--------------------------------------- -CONFIGURE_FILE ( - ${PROJECT_SOURCE_DIR}/config.h_cmake.in - ${PROJECT_BINARY_DIR}/config.h ) - - -#---------------------------------------- -# output paths -#---------------------------------------- -SET (LIBRARY_OUTPUT_PATH - ${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" - ) - -MARK_AS_ADVANCED ( - 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(CMAKE_INSTALL_PREFIX /Applications/Cantera ) -INSTALL_FILES ( /include/cantera .h ${CANTERA_CXX_HEADERS} ) diff --git a/Cantera/CMakeLists.txt b/Cantera/CMakeLists.txt deleted file mode 100644 index 82af06ff1..000000000 --- a/Cantera/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -#------------------------------------------------- -# Build the kernel -#------------------------------------------------- -add_subdirectory(src) - -#------------------------------------------------- -# Build clib -#------------------------------------------------- -add_subdirectory(clib) - -#------------------------------------------------- -# Build C++ user interface -#------------------------------------------------- -add_subdirectory(cxx) - - diff --git a/Cantera/clib/CMakeLists.txt b/Cantera/clib/CMakeLists.txt deleted file mode 100644 index febd4f0ab..000000000 --- a/Cantera/clib/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(src) diff --git a/Cantera/clib/src/CMakeLists.txt b/Cantera/clib/src/CMakeLists.txt deleted file mode 100644 index 65db2c787..000000000 --- a/Cantera/clib/src/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -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) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/kinetics) -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) - -ADD_LIBRARY ( clib ${CLIB_SRCS} ) - -TARGET_LINK_LIBRARIES (clib oneD zeroD equil kinetics thermo ctbase) - -SET (CLIB_H ct.h Storage.h ctsurf.h ctrpath.h ctreactor.h - ctfunc.h ctxml.h ctonedim.h ctmultiphase.h ) - - - diff --git a/Cantera/cmake_install.cmake b/Cantera/cmake_install.cmake deleted file mode 100644 index 736794ad1..000000000 --- a/Cantera/cmake_install.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Install script for directory: /Users/dgg/dv/sf/cantera/Cantera - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Debug") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -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/clib/cmake_install.cmake") - INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) diff --git a/Cantera/cxx/CMakeLists.txt b/Cantera/cxx/CMakeLists.txt deleted file mode 100644 index 32869e907..000000000 --- a/Cantera/cxx/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -add_subdirectory( include ) -add_subdirectory( src ) -add_subdirectory( demos ) diff --git a/Cantera/cxx/cmake_install.cmake b/Cantera/cxx/cmake_install.cmake deleted file mode 100644 index 53b031cef..000000000 --- a/Cantera/cxx/cmake_install.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Install script for directory: /Users/dgg/dv/sf/cantera/Cantera/cxx - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Debug") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -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") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) diff --git a/Cantera/cxx/demos/CMakeLists.txt b/Cantera/cxx/demos/CMakeLists.txt deleted file mode 100644 index 44fce4f14..000000000 --- a/Cantera/cxx/demos/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -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 ) - - diff --git a/Cantera/cxx/include/CMakeLists.txt b/Cantera/cxx/include/CMakeLists.txt deleted file mode 100644 index c073b848f..000000000 --- a/Cantera/cxx/include/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -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}) diff --git a/Cantera/cxx/src/CMakeLists.txt b/Cantera/cxx/src/CMakeLists.txt deleted file mode 100644 index 4f5e4bdec..000000000 --- a/Cantera/cxx/src/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -SET ( CXX_SRCS importPhase.cpp ) - -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}) -INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera/kernel) - -ADD_LIBRARY (ctcxx ${CXX_SRCS}) diff --git a/Cantera/python/CMakeLists.txt b/Cantera/python/CMakeLists.txt deleted file mode 100644 index 2cc858d90..000000000 --- a/Cantera/python/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory (src) diff --git a/Cantera/src/CMakeLists.txt b/Cantera/src/CMakeLists.txt deleted file mode 100644 index 814022fc2..000000000 --- a/Cantera/src/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_subdirectory(base) -add_subdirectory(thermo) -add_subdirectory(numerics) -add_subdirectory(kinetics) -add_subdirectory(transport) -add_subdirectory(equil) -add_subdirectory(spectra) - -add_subdirectory(oneD) -add_subdirectory(zeroD) - diff --git a/Cantera/src/base/CMakeLists.txt b/Cantera/src/base/CMakeLists.txt deleted file mode 100644 index 9e2b6d60d..000000000 --- a/Cantera/src/base/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -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 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}) diff --git a/Cantera/src/equil/CMakeLists.txt b/Cantera/src/equil/CMakeLists.txt deleted file mode 100644 index a627c2584..000000000 --- a/Cantera/src/equil/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -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) - -ADD_LIBRARY(equil ${EQUIL_SRCS} ) -TARGET_LINK_LIBRARIES( equil numerics thermo ctbase) - -SET(EQUIL_H ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h PropertyCalculator.h) -INSTALL_FILES(/include/cantera/kernel FILES ${EQUIL_H}) - diff --git a/Cantera/src/kinetics/CMakeLists.txt b/Cantera/src/kinetics/CMakeLists.txt deleted file mode 100644 index ef97e31a7..000000000 --- a/Cantera/src/kinetics/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET (KINETICS_SRCS importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp - GasKinetics.cpp FalloffFactory.cpp ReactionStoichMgr.cpp Kinetics.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) - -ADD_LIBRARY(kinetics ${KINETICS_SRCS}) - -TARGET_LINK_LIBRARIES (kinetics numerics thermo ctbase) - -SET(KINETICS_H importKinetics.h GRI_30_Kinetics.h KineticsFactory.h - Kinetics.h GasKinetics.h - FalloffFactory.h ReactionStoichMgr.h reaction_defs.h - FalloffMgr.h ThirdBodyMgr.h RateCoeffMgr.h ReactionData.h - RxnRates.h Enhanced3BConc.h StoichManager.h solveSP.h InterfaceKinetics.h - ImplicitSurfChem.h EdgeKinetics.h Group.h ReactionPath.h) - -INSTALL_FILES(/cantera/kernel FILES ${KINETICS_H}) diff --git a/Cantera/src/numerics/CMakeLists.txt b/Cantera/src/numerics/CMakeLists.txt deleted file mode 100644 index d7c452775..000000000 --- a/Cantera/src/numerics/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -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 cvode) - -SET(NUMERICS_H ArrayViewer.h CVodeInt.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}) diff --git a/Cantera/src/oneD/CMakeLists.txt b/Cantera/src/oneD/CMakeLists.txt deleted file mode 100644 index 63ed9d6ab..000000000 --- a/Cantera/src/oneD/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -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) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/kinetics) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/transport) - -ADD_LIBRARY(oneD ${ONED_SRCS} ) - -SET (ONED_H Inlet1D.h MultiJac.h Sim1D.h StFlow.h - Surf1D.h Domain1D.h MultiNewton.h OneDim.h - Resid1D.h Solid1D.h refine.h) - -INSTALL_FILES(/include/cantera/kernel FILES ${ONED_H}) - diff --git a/Cantera/src/spectra/CMakeLists.txt b/Cantera/src/spectra/CMakeLists.txt deleted file mode 100644 index 9b8a58746..000000000 --- a/Cantera/src/spectra/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -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) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/transport) - -ADD_LIBRARY(spectra ${SPECTRA_SRCS} ) - -SET (SPECTRA_H rotor.h LineBroadener.h Nuclei.h spectralUtilities.h) -INSTALL_FILES(/include/cantera/kernel FILES ${SPECTRA_H}) - diff --git a/Cantera/src/thermo/CMakeLists.txt b/Cantera/src/thermo/CMakeLists.txt deleted file mode 100644 index abd385e16..000000000 --- a/Cantera/src/thermo/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -SET (THERMO_SRCS State.cpp Elements.cpp Constituents.cpp Phase.cpp - ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp - SpeciesThermoFactory.cpp ConstCpPoly.cpp Nasa9Poly1.cpp - Nasa9PolyMultiTempRegion.cpp - Mu0Poly.cpp GeneralSpeciesThermo.cpp SurfPhase.cpp - ThermoFactory.cpp phasereport.cpp SemiconductorPhase.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}) - -TARGET_LINK_LIBRARIES (thermo ctbase) - -SET(THERMO_H State.h Elements.h Constituents.h Phase.h mix_defs.h - ThermoPhase.h IdealGasPhase.h ConstDensityThermo.h - SpeciesThermoFactory.h ThermoFactory.h - NasaPoly1.h NasaPoly2.h NasaThermo.h Nasa9Poly1.h - Nasa9PolyMultiTempRegion.h - ShomateThermo.h ShomatePoly.h ConstCpPoly.h - SimpleThermo.h SpeciesThermoMgr.h - SpeciesThermoInterpType.h - GeneralSpeciesThermo.h Mu0Poly.h - speciesThermoTypes.h SpeciesThermo.h SurfPhase.h - EdgePhase.h ) -# @phase_header_files@) - -INSTALL_FILES(/include/cantera/kernel FILES ${THERMO_H}) diff --git a/Cantera/src/transport/CMakeLists.txt b/Cantera/src/transport/CMakeLists.txt deleted file mode 100644 index cfe392c18..000000000 --- a/Cantera/src/transport/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -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) - -ADD_LIBRARY(transport ${TRANSPORT_SRCS}) - -TARGET_LINK_LIBRARIES (transport numerics thermo ctbase) - -SET (TRANSPORT_H TransportFactory.h MultiTransport.h MixTransport.h - MMCollisionInt.h SolidTransport.h DustyGasTransport.h - TransportBase.h L_matrix.h TransportParams.h ) -INSTALL_FILES(/include/cantera/kernel FILES ${TRANSPORT_H}) - - diff --git a/Cantera/src/zeroD/CMakeLists.txt b/Cantera/src/zeroD/CMakeLists.txt deleted file mode 100644 index b30aa2755..000000000 --- a/Cantera/src/zeroD/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -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) -INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/kinetics) - -ADD_LIBRARY(zeroD ${ZEROD_SRCS} ) - -SET (ZEROD_H Reactor.h ReactorBase.h FlowDevice.h Wall.h ReactorNet.h - flowControllers.h Reservoir.h FlowReactor.h - ConstPressureReactor.h ReactorFactory.h ) -INSTALL_FILES(/include/cantera/kernel FILES ${ZEROD_H}) - diff --git a/cmake/fortran.cmake b/cmake/fortran.cmake deleted file mode 100644 index 21e62eb18..000000000 --- a/cmake/fortran.cmake +++ /dev/null @@ -1,15 +0,0 @@ -#### Cantera Fortran configuration file - -#if (NOT BUILD_WITH_F2C) - -#### Fortran 90 -message("Fortran cmake") - -if (BUILD_F90_INTERFACE) - if (F90 STREQUAL "default") - FIND_LIBRARY(GFORTRAN_LIB gfortran ${F90_LIB_DIR} /usr/local/lib) - IF (GFORTRAN_LIB) - MESSAGE("${GFORTRAN_LIB}") - ENDIF (GFORTRAN_LIB) - endif (F90 STREQUAL "default") -endif (BUILD_F90_INTERFACE) diff --git a/config.cmake b/config.cmake deleted file mode 100755 index e29ab0219..000000000 --- a/config.cmake +++ /dev/null @@ -1,25 +0,0 @@ - -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(CANTERA_VERSION "1.7.1") - -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 ) diff --git a/config.h_cmake.in b/config.h_cmake.in deleted file mode 100644 index 17b681840..000000000 --- a/config.h_cmake.in +++ /dev/null @@ -1,140 +0,0 @@ -// -// Input file for CMAKE to generate config.h -// - - -#ifndef CT_CONFIG_H -#define CT_CONFIG_H - - -//------------------------ Development flags ------------------// -// -// Compile in additional debug printing where available. -// Note, the printing may need to be turned on via a switch. -// This just compiles in the code. -#cmakedefine DEBUG_MODE - -// 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 int integer; // Fortran integer -typedef int ftnlen; // Fortran hidden string length type - - -// Fortran compilers pass character strings in argument lists by -// 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 -// 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. -#cmakedefine STRING_LEN_AT_END - - -// Define this if Fortran adds a trailing underscore to names in object files. -// For linux and most unix systems, this is the case. -#cmakedefine FTN_TRAILING_UNDERSCORE - - -#cmakedefine HAS_SUNDIALS -#cmakedefine SUNDIALS_VERSION_22 -#cmakedefine SUNDIALS_VERSION_23 - -//-------- LAPACK / BLAS --------- - -#define LAPACK_FTN_STRING_LEN_AT_END -#define LAPACK_NAMES_LOWERCASE -#define LAPACK_FTN_TRAILING_UNDERSCORE - - -//--------- operating system -------------------------------------- - -// The configure script defines this if the operatiing system is Mac -// OS X, This used to add some Mac-specific directories to the default -// data file search path. -#cmakedefine DARWIN -#cmakedefine HAS_SSTREAM - -// Cantera version -#define CANTERA_VERSION "@CANTERA_VERSION@" - -// Identify whether the operating system is cygwin's overlay of -// windows, with gcc being used as the compiler. -#cmakedefine CYGWIN - -// Identify whether the operating system is windows based, with -// microsoft vc++ being used as the compiler -#cmakedefine WINMSVC - -//--------- Fonts for reaction path diagrams ---------------------- -#define RXNPATH_FONT Helvetica - -//--------------------- Python ------------------------------------ -// This path to the python executable is created during -// Cantera's setup. It identifies the python executable -// used to run Python to process .cti files. Note that this is only -// used if environment variable PYTHON_CMD is not set. -#define PYTHON_EXE "@PYTHON_EXE@" - -// If this is defined, the Cantera Python interface will use the -// Numeric package; otherwise, it will use numarray. -#cmakedefine HAS_NUMERIC - -// If this is defined, then python will not be assumed to be -// present to support conversions -#cmakedefine HAS_NO_PYTHON - -//--------------------- Cantera ----------------------------------- -// This is the data pathway used to locate the top of the -// build directory. -#cmakedefine CANTERA_ROOT - -// This data pathway is used to locate a directory where datafiles -// are to be found. Note, the local directory is always searched -// as well. -#cmakedefine CANTERA_DATA - - -#cmakedefine WITH_HTML_LOGS - -// define STORE_MOLE_FRACTIONS if you want Cantera to internally -// represent the composition of a mixture as mole fractions. Usually -// the best choice. -#define STORE_MOLE_FRACTIONS - -// define STORE_MASS_FRACTIONS if you want Cantera to internally -// represent the composition of a mixture as mass fractions. Usually -// results in slightly worse performance, but may not in all cases. -//#define STORE_MASS_FRACTIONS -#cmakedefine STORE_MASS_FRACTIONS - -//--------------------- compile options ---------------------------- -#cmakedefine USE_PCH - -#cmakedefine THREAD_SAFE_CANTERA - -//--------------------- optional phase models ---------------------- -// This define indicates the enabling of the inclusion of -// accurate liquid/vapor equations -// of state for several fluids, including water, nitrogen, hydrogen, -// oxygen, methane, andd HFC-134a. -#cmakedefine INCL_PURE_FLUIDS -#cmakedefine WITH_PURE_FLUIDS - -#cmakedefine WITH_LATTICE_SOLID -#cmakedefine WITH_METAL -#cmakedefine WITH_STOICH_SUBSTANCE -// Enable expanded thermodynamic capabilities, adding -// ideal solid solutions -#cmakedefine WITH_IDEAL_SOLUTIONS -// Enable expanded electrochemistry capabilities, include thermo -// models for electrolyte solutions. -#cmakedefine WITH_ELECTROLYTES - -#cmakedefine WITH_PRIME - - -#endif diff --git a/config_cantera.cmake b/config_cantera.cmake deleted file mode 100644 index 075d86bc3..000000000 --- a/config_cantera.cmake +++ /dev/null @@ -1,22 +0,0 @@ - -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 ) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt deleted file mode 100644 index 42207b639..000000000 --- a/ext/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -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 ) - - diff --git a/ext/f2c_blas/CMakeLists.txt b/ext/f2c_blas/CMakeLists.txt deleted file mode 100644 index e8b1644c7..000000000 --- a/ext/f2c_blas/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET (F2C_BLAS_SRCS dasum.c daxpy.c dcabs1.c dcopy.c ddot.c -dgbmv.c dgemm.c dgemv.c dger.c dnrm2.c drot.c drotg.c -drotm.c drotmg.c dsbmv.c dscal.c dsdot.c dspmv.c dspr.c dspr2.c -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}) - - diff --git a/ext/f2c_lapack/CMakeLists.txt b/ext/f2c_lapack/CMakeLists.txt deleted file mode 100644 index 6b65c3df4..000000000 --- a/ext/f2c_lapack/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ - -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 - dlasq1.c dlasq2.c dlasq3.c dlasq4.c dlasq5.c dlasq6.c dlasr.c dlasrt.c - dlassq.c dlasv2.c dlaswp.c dorg2r.c dorgbr.c dorgl2.c dorglq.c dorgqr.c - dorm2r.c dormbr.c dorml2.c dormlq.c dormqr.c drscl.c dtrtri.c - dtrti2.c ieeeck.c ilaenv.c ) - -ADD_LIBRARY(ctlapack ${F2C_LAPACK_SRCS}) - - - diff --git a/ext/f2c_libs/CMakeLists.txt b/ext/f2c_libs/CMakeLists.txt deleted file mode 100644 index 1a481d2f8..000000000 --- a/ext/f2c_libs/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -SET (F2C_LIB_SRCS f77vers.c i77vers.c main.c s_rnge.c abort_.c - exit_.c getarg_.c iargc_.c - getenv_.c signal_.c s_stop.c s_paus.c - system_.c cabs.c - derf_.c derfc_.c erf_.c erfc_.c sig_die.c uninit.c - pow_ci.c pow_dd.c pow_di.c pow_hh.c - pow_ii.c pow_ri.c pow_zi.c pow_zz.c - c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c - c_sqrt.c - z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c - z_sqrt.c - r_abs.c r_acos.c r_asin.c r_atan.c r_atn2.c - r_cnjg.c r_cos.c - r_cosh.c r_dim.c r_exp.c r_imag.c r_int.c - r_lg10.c r_log.c r_mod.c r_nint.c r_sign.c - r_sin.c r_sinh.c r_sqrt.c r_tan.c r_tanh.c - d_abs.c d_acos.c d_asin.c d_atan.c d_atn2.c - d_cnjg.c d_cos.c d_cosh.c d_dim.c d_exp.c - d_imag.c d_int.c d_lg10.c d_log.c d_mod.c - d_nint.c d_prod.c d_sign.c d_sin.c d_sinh.c - d_sqrt.c d_tan.c d_tanh.c i_abs.c i_dim.c - i_dnnt.c i_indx.c i_len.c i_mod.c i_nint.c i_sign.c - lbitbits.c lbitshft.c h_abs.c h_dim.c h_dnnt.c - h_indx.c h_len.c h_mod.c h_nint.c h_sign.c - l_ge.c l_gt.c l_le.c l_lt.c hl_ge.c hl_gt.c - hl_le.c hl_lt.c ef1asc_.c ef1cmc_.c - f77_aloc.c s_cat.c s_cmp.c s_copy.c - backspac.c close.c dfe.c dolio.c due.c - endfile.c err.c - fmt.c fmtlib.c ftell_.c iio.c ilnw.c - inquire.c lread.c lwrite.c - open.c rdfmt.c rewind.c rsfe.c rsli.c - rsne.c sfe.c sue.c - typesize.c uio.c util.c wref.c wrtfmt.c - wsfe.c wsle.c wsne.c xwsne.c - dtime_.c etime_.c) - -ADD_LIBRARY(ctf2c ${F2C_LIB_SRCS}) - diff --git a/ext/f2c_math/CMakeLists.txt b/ext/f2c_math/CMakeLists.txt deleted file mode 100644 index 98fd72cb1..000000000 --- a/ext/f2c_math/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -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_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/ext/f2c_libs ) - -ADD_LIBRARY( ctmath ${CTMATH_SRCS} ) - diff --git a/ext/tpx/CMakeLists.txt b/ext/tpx/CMakeLists.txt deleted file mode 100644 index ed9f405d9..000000000 --- a/ext/tpx/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -SET ( TPX_SRCS HFC134a.cpp Heptane.cpp Hydrogen.cpp Methane.cpp - Nitrogen.cpp Oxygen.cpp RedlichKwong.cpp CarbonDioxide.cpp - Sub.cpp Water.cpp utils.cpp lk.cpp ) - -INCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR} ) -#IINCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR}/build/include/cantera ) - -ADD_LIBRARY( tpx ${TPX_SRCS} ) -