research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7235 commits 2 branches 16 tags 37 MiB
Commit graph

427 commits

Author SHA1 Message Date
Ray Speth
13259299ba [SCons] Correctly identify Cygwin builds 
The correct preprocessor macro to use is the one provided by the
compiler, '__CYGWIN__'.
 2014-02-20 03:00:52 +00:00
Ray Speth
ca0ea8bc35 [SCons] Simplify treatment of sydep1.h and signal1.h 
We don't actually have system-dependent versions of these headers,
so just put the templates in place directly.
 2014-02-20 03:00:45 +00:00
Ray Speth
14b1bf093b Remove option to disable 'h298modify_capability' at compile-time 2014-02-06 22:58:56 +00:00
Ray Speth
eaceaf7b86 [SCons] Use SCons to compile the Cython extension 
Fixes issues with mismatched compilers between the Cython extension and the
cantera library, especially on OS X. Improves build dependency resolution to
eliminate unnecessary recompilation of _cantera.cpp.
 2014-01-31 23:15:17 +00:00
Ray Speth
d9af4af88f [Fortran] Fix compiler used for building Fortran sample programs 2014-01-23 04:20:48 +00:00
Ray Speth
e51ca819fe [SCons] Fix an error when not using Sundials 
'has_sundials_lapack' is only defined if we are using Sundials.
 2014-01-21 18:06:47 +00:00
Ray Speth
2144738ea1 [SCons] Fix minor typo in warning message 2014-01-21 17:22:14 +00:00
Ray Speth
1ff7bc2f3b [SCons] Remove check for <tr1/tuple> 
Updated gtest version makes this special case unnecessary.
 2014-01-21 17:22:09 +00:00
Bryan W. Weber
4badbd1fb3 [SCons/0D] Update to enable Sundials linked with external BLAS/LAPACK. 
With help from Nick Curtis and Ray Speth.
 2014-01-20 15:19:53 +00:00
Ray Speth
a75a9c6e21 [SCons] Install Python 3 module to stage directory 2014-01-09 23:12:27 +00:00
Ray Speth
a8d8f3f0ca [SCons] Check for <tr1/tuple> 
This header is used by GTest. If not present, define 'GTEST_USE_OWN_TR1_TUPLE'
to use an alternative version. Fixes a compilation error on OS X.
 2014-01-08 17:10:34 +00:00
Ray Speth
e79e453e77 [SCons] Fix Matlab-related paths in post-install message 2014-01-02 22:23:26 +00:00
Ray Speth
59fb3ed1bc [Doc] Fix punctuation in messages in SConstruct 2013-12-18 17:47:07 +00:00
Ray Speth
a8e884d34e [SCons] Check for incompabible BLAS/LAPACK when building Matlab toolbox 
Matlab's practice of substituting an "8 byte integer" BLAS/LAPACK
library for the "4 byte integer" BLAS/LAPACK libraries that Cantera is
designed to use causes Cantera to crash. This can only be avoided by
statically linking Cantera to BLAS and LAPACK, e.g. by using the
BLAS/LAPACK implementations included with Cantera.

Since the Matlab toolbox itself needs to be a shared library, it is
not usually possible to link statically link it with vendor-provided
BLAS/LAPACK libraries, since they are not compiled with the
appropriate options, i.e. '-fPIC'.

Resolves Issue 34.
 2013-12-18 17:45:25 +00:00
Ray Speth
54d11a016a Remove support for old Sundials versions 
Supported Sundials versions are 2.4 and 2.5.
 2013-12-14 00:18:17 +00:00
Ray Speth
f63f8ae57e Remove deprecated HTML logging functionality 2013-12-09 01:36:11 +00:00
Ray Speth
cf4ae23587 [Python] Remove support for obsolete 'numarray' and 'numeric' packages 2013-12-09 01:35:58 +00:00
Ray Speth
b5e540c903 [Python] Remove the legacy Python module 2013-12-09 01:35:08 +00:00
Ray Speth
24a8d07b60 [SCons] Minor cleanup of SConstruct 2013-12-09 01:34:20 +00:00
Ray Speth
6b68564245 Bump trunk version to 2.2a 2013-12-09 01:33:58 +00:00
Ray Speth
bbaf0ff7a0 Fix CXX flags for VS2012 
Resolves Issue 184.
 2013-11-12 23:44:42 +00:00
Ray Speth
e1074722c5 [SCons] Restore 'single_library' build option 
The 'single_library=y' build option must be retained in order to support
compilation on Windows and OS X.
 2013-10-04 16:22:55 +00:00
Harry Moffat
cfa4493b51 Worked on fixing errors in the code that caused problems with downstream code. 
Took out single_species compilation option

took out some deprecated warnings

Fixed an error in copy constructors for thermo.

Still an error with PYTHONPATH and the test suite

 -- more to come.
 2013-09-02 00:58:28 +00:00
Ray Speth
957c88fcff Bump version to 2.1.0 2013-10-24 02:40:14 +00:00
Ray Speth
be1573e85e [SCons] Fix undefined build variable when building MSI 2013-10-24 02:40:12 +00:00
Ray Speth
f871dd8cf0 [SCons] Add 'python_compiler' option for Cython module compilation 2013-10-15 14:59:31 +00:00
Ray Speth
584392d856 [SCons] Fix linking boost_thread in more places 2013-09-30 16:02:39 +00:00
Ray Speth
721f0266be [SCons] Fix some dependency issues for building "ctpath.m" 2013-09-06 20:34:18 +00:00
Ray Speth
7683677cac Bump version to 2.1.0b3 2013-09-01 00:33:55 +00:00
Ray Speth
b0635fe748 [SCons] Fix compilation of Python 3 module when PYTHONHOME is set 2013-09-01 00:33:49 +00:00
Ray Speth
fc878f09fd [SCons] Include Sundials library and header files in Windows installer 2013-09-01 00:33:37 +00:00
Ray Speth
1969a4d399 [SCons] Add configuration option for specifying required Boost libraries. 
The set of Boost libraries which are required by Cantera, through the use of
Boost.Thread, depends on the Boost version. The static libraries are needed
when compiling anything that links to Cantera, so these libraries are copied
to the Cantera installation directory on Windows, where compiling Boost from
source is a burden.
 2013-09-01 00:33:32 +00:00
Ray Speth
32ea4fd924 [SCons] Fix to skip Python startup messages 
This fixes an issue when the Python interpreter prints startup messages that
appear before the expected output lines. Known to be a problem with the Anaconda
Python distribution.
 2013-08-16 17:25:04 +00:00
Ray Speth
6126521ff3 [SCons] Eliminate spurious warnings about environment variables 2013-08-09 15:35:07 +00:00
Ray Speth
4d88fa8e34 Bump version to 2.1.0b2 2013-08-02 23:31:36 +00:00
Ray Speth
988f300e6b [SCons] Add PYTHONPATH to list of default environment variables 
Simplifies compilation when Python packages needed for compilation (e.g. Cython)
are not installed in system-wide locations.
 2013-08-02 23:17:42 +00:00
Ray Speth
f320290c51 [SCons] Fix Python module path in setup_cantera and post-install message 
In particular, this fixes paths for Linux distros that put Python modules in
'lib64/pythonX.Y/site-packages'.

Also fixes the reported installation path for the Python module on Windows.
 2013-07-29 01:37:57 +00:00
Ray Speth
e65cd38214 Bump version to 2.1.0b1 2013-07-23 15:53:31 +00:00
Ray Speth
c846d8237e [SCons] Check Cython version for Python 3.x 2013-07-18 22:39:23 +00:00
Ray Speth
c575bf6fb2 [SCons] Check Cython version for Python 2.x 2013-07-18 22:39:21 +00:00
Ray Speth
e1fe14a9b0 [SCons] Make the new Python package the default 2013-06-26 00:23:18 +00:00
Ray Speth
029e2c5d2e [SCons] single_library defaults to True 
Also, using single_library=n is deprecated.
 2013-06-26 00:23:14 +00:00
Ray Speth
1ac855ae9b [SCons] Mention config.log in relevant error messages 2013-06-26 00:23:11 +00:00
Ray Speth
5213393c1e [SCons] Fix 'HAS_NO_PYTHON' to account for the Python 3 package 2013-06-24 15:22:55 +00:00
Ray Speth
73c43a3a26 [SCons] Keep default values of compiler flags out of cantera.conf 2013-06-24 15:22:52 +00:00
Ray Speth
dcb579df98 [SCons] Only copy Boost libraries when they are being used 2013-06-24 15:22:48 +00:00
Ray Speth
c625d8327e [SCons] Fix an issue when using virtualenv 
Virtualenv substitutes an old version of site.py that may not have the
getusersitepackages function. However, it appears that USER_SITE is set
correctly in these cases.
 2013-06-24 15:21:28 +00:00
Ray Speth
d19d18dd77 [SCons] Print options read from cantera.conf 
This prevents surprises when an unexpected option value is saved in
cantera.conf.
 2013-06-17 14:19:50 +00:00
Ray Speth
97ff4fa2a5 [SCons] Fix handling of blas_lapack_dir and boost_lib_dir 
These need to be added to LIBPATH as entries in a list, otherwise
LIBPATH ends up concatenating the strings for each as a single entry.
 2013-06-14 23:06:29 +00:00
Ray Speth
1e02732140 [SCons] Deprecate the 'legacy_headers' option 2013-06-13 22:49:58 +00:00