*** empty log message ***
This commit is contained in:
Dave Goodwin
parent
3ae5bf0ef1
commit
d08fc24fb0
8 changed files with 51 additions and 25 deletions
|
|
@ -3,7 +3,7 @@ PROJECT (Cantera)
|
|||
#----------------------------
|
||||
# user-configurable settings
|
||||
#----------------------------
|
||||
#INCLUDE (config.cmake)
|
||||
INCLUDE (config.cmake)
|
||||
|
||||
|
||||
#operating system
|
||||
|
|
@ -19,17 +19,26 @@ else (PYTHON_CMD STREQUAL "default")
|
|||
SET( PYTHON_EXE ${PYTHON_CMD} )
|
||||
endif (PYTHON_CMD STREQUAL "default")
|
||||
|
||||
INCLUDE(cmake/fortran.cmake)
|
||||
|
||||
# configuration
|
||||
CONFIGURE_FILE (
|
||||
${PROJECT_SOURCE_DIR}/config.h_cmake.in
|
||||
${PROJECT_BINARY_DIR}/config.h )
|
||||
|
||||
include_directories(${PROJECT_BINARY_DIR})
|
||||
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR})
|
||||
|
||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION})
|
||||
SET (LIBRARY_OUTPUT_PATH
|
||||
${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all libraries"
|
||||
)
|
||||
|
||||
add_subdirectory(Cantera)
|
||||
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
|
||||
)
|
||||
|
||||
ADD_SUBDIRECTORY (Cantera)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
add_subdirectory(src)
|
||||
add_subdirectory(clib)
|
||||
add_subdirectory(fortran)
|
||||
#add_subdirectory(clib)
|
||||
#add_subdirectory(fortran)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
PY_DEMOS = simple.py stoich.py adiabatic.py multiphase_plasma.py
|
||||
PYTHON_CMD = /Library/Frameworks/Python.framework/Versions/Current/bin/python
|
||||
|
||||
run:
|
||||
@(for py in $(PY_DEMOS) ; do \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
import sys
|
||||
try:
|
||||
from distutils.core import setup, Extension
|
||||
except:
|
||||
print 'could not import distutils. Will try anyway...'
|
||||
from distutils.core import setup, Extension
|
||||
|
||||
libs = []
|
||||
platform = sys.platform
|
||||
|
|
|
|||
|
|
@ -6,4 +6,25 @@ SET (THERMO_SRCS State.cpp Elements.cpp Constituents.cpp Phase.cpp
|
|||
ThermoFactory.cpp phasereport.cpp SemiconductorPhase.cpp
|
||||
StoichSubstance.cpp PureFluidPhase.cpp LatticeSolidPhase.cpp
|
||||
LatticePhase.cpp)
|
||||
SET(CMAKE_CXX_FLAGS -I/${PROJECT_SOURCE_DIR}/Cantera/src/base)
|
||||
|
||||
SET (LIBRARY_OUTPUT_PATH
|
||||
${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all libraries"
|
||||
)
|
||||
|
||||
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@)
|
||||
|
|
|
|||
20
config.cmake
20
config.cmake
|
|
@ -51,16 +51,13 @@
|
|||
# to process .cti files, then you only need a minimal subset of the
|
||||
# package (actually, only one file).
|
||||
|
||||
# Set PYTHON_PACKAGE to one of these four strings:
|
||||
# full install everything needed to use Cantera from Python
|
||||
# minimal install only enough to process .cti files
|
||||
# none Don't install or run any Python scripts during the
|
||||
# build process
|
||||
# default try to do a full installation, but fall back to a minimal
|
||||
# one in case of errors
|
||||
OPTION(CANTERA_BUILD_PYTHON_PACKAGE "Build the Python Package?" ON)
|
||||
OPTION(CANTERA_BUILD_FULL_PYTHON "Include support for using Cantera from Python?" ON)
|
||||
OPTION(CANTERA_BUILD_MIN_PYTHON "Include support for using CTI input files?" ON)
|
||||
|
||||
SET(CANTERA_PYTHON_PACKAGE_TYPE "default" CACHE LIST "full or minimal")
|
||||
MARK_AS_ADVANCED (
|
||||
CANTERA_BUILD_FULL_PYTHON
|
||||
CANTERA_BUILD_MIN_PYTHON
|
||||
)
|
||||
|
||||
# Cantera needs to know where to find the Python interpreter. If
|
||||
# PYTHON_CMD is set to "default", then cmake will look for the Python
|
||||
|
|
@ -74,13 +71,13 @@ SET( USE_NUMERIC "default")
|
|||
|
||||
# If numarray was installed using the --home option, set this to the
|
||||
# home directory for numarray.
|
||||
SET( NUMARRAY_HOME "$HOME/python_packages")
|
||||
# SET( NUMARRAY_HOME "$HOME/python_packages")
|
||||
|
||||
SET( CANTERA_VERSION "1.7.1")
|
||||
|
||||
SET( WITH_PURE_FLUIDS 1 )
|
||||
|
||||
SET( WITH_LATTICE_SOLID 0 )
|
||||
SET( WITH_LATTICE_SOLID 1 )
|
||||
|
||||
SET( WITH_METAL 1 )
|
||||
|
||||
|
|
@ -89,4 +86,3 @@ SET( WITH_STOICH_SUBSTANCE 1 )
|
|||
SET ( WITH_IDEAL_SOLUTIONS 1 )
|
||||
|
||||
SET (WITH_ELECTROLYTES 1 )
|
||||
|
||||
|
|
|
|||
3
configure
vendored
3
configure
vendored
|
|
@ -9405,7 +9405,7 @@ fi
|
|||
|
||||
|
||||
|
||||
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/spectra/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 data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/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/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/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 test_problems/cathermo/HMW_dupl_test/Makefile test_problems/VCSnonideal/Makefile test_problems/VCSnonideal/NaCl_equil/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/spectra/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 Cantera/python/examples/equilibrium/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 data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/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/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/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 test_problems/cathermo/HMW_dupl_test/Makefile test_problems/VCSnonideal/Makefile test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc"
|
||||
|
||||
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
|
|
@ -9905,6 +9905,7 @@ do
|
|||
"Cantera/cxx/demos/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/Makefile" ;;
|
||||
"Cantera/user/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/user/Makefile" ;;
|
||||
"Cantera/python/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/src/Makefile" ;;
|
||||
"Cantera/python/examples/equilibrium/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/Makefile" ;;
|
||||
"ext/lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/lapack/Makefile" ;;
|
||||
"ext/blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/blas/Makefile" ;;
|
||||
"ext/cvode/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/cvode/Makefile" ;;
|
||||
|
|
|
|||
|
|
@ -1659,6 +1659,7 @@ AC_OUTPUT(Makefile \
|
|||
Cantera/cxx/demos/Makefile \
|
||||
Cantera/user/Makefile \
|
||||
Cantera/python/src/Makefile \
|
||||
Cantera/python/examples/equilibrium/Makefile \
|
||||
ext/lapack/Makefile \
|
||||
ext/blas/Makefile \
|
||||
ext/cvode/Makefile \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue