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

46 commits

Author SHA1 Message Date
Ray Speth
d6da006e3e [SCons] Only build the Python package for Python 3.x 2018-09-19 17:59:59 -04:00
Ray Speth
dcb7f34b4a [SCons] Remove non-functional python_array_home option 
This option has been broken since before Cantera 2.3.0, so must have
been unused.
 2018-09-19 17:59:59 -04:00
Ray Speth
4a4886f63e Generate setup_cantera.csh for use with csh/tcsh 
Resolves #453
 2017-12-02 20:03:15 -05:00
Bryan W. Weber
2bc4d09da3 Fix substitution of setup_cantera and ctpath.m 
Use Python 3 variables by default, and Python 2 only if Python 3 isn't
being built
 2017-11-26 16:48:40 -05:00
Ray Speth
d0a5003eac [SCons] Fix compiler flags included in cantera.pc 
Missing '-std=c++0x' or equivalent would lead to compilation errors.
 2016-12-21 21:23:50 -05:00
Ray Speth
3261b4108a [SCons] Link Fortran sample programs to the correct standard library 2016-07-20 18:43:41 -04:00
Ray Speth
df43a474cd [SCons] Modify build system to exclude unused Fortran and f2c code 
Cantera no longer requires BLAS / LAPACK (but can use them if available), so it
is never necessary to compile any of the external Fortran or f2c-converted code.
 2016-05-14 22:00:22 -04:00
Ray Speth
31c66378c6 [SCons] Fix Cantera.mak when blas_lapack_dir is empty 
Previously, if no library directory needed to be specified for BLAS/LAPACK, the
link line would end up containing '-L -llapack -lblas' which is interpreted as
adding the directory '-llapack' to the linker search path.
 2016-04-01 15:48:12 -04:00
Ray Speth
b4a1fb2db1 [SCons/Numerics] Use ext/sundials if system Sundials not installed 2015-11-23 16:53:20 -05:00
Bryan W. Weber
b395c68236 [SCons] Fix Cantera.mak cannot be written if extra_inc_dirs or extra_lib_dirs is specified 2015-10-28 12:55:23 -04:00
Ray Speth
f9375e1a09 Use locks/mutexes from the standard library instead of Boost.Thread 
This eliminates the need to link against any of the compiled Boost libraries,
and means that we can always build in thread-safe mode
 2015-10-17 18:58:50 -04:00
Ray Speth
6a9dd7f9d6 Remove unused 'csvdiff' application 2015-07-15 12:20:22 -04:00
Ray Speth
eb75e8b6cc [SCons] Fix BLAS/LAPACK-related variables in Cantera.mak 
* Fix logic for when BLAS/LAPACK libraries need to be explicitly listed
* ctlapack and ctblas are no longer separate libraries
 2015-06-22 16:53:04 -04:00
Ray Speth
7f847c3877 [SCons] Miscellaneous cleanup of SConstruct/SConscript files 2015-06-13 23:29:58 -04:00
Ray Speth
341b137766 [Doc] Capitalize proper nouns and acronyms 2015-05-25 20:58:44 -04:00
Ray Speth
8ce62988a1 [SCons] Remove previously-deprecated configuration options 2015-05-11 17:23:37 -04:00
Ray Speth
4e68860165 Generate cantera.pc and Cantera.mak when using MinGW 2014-04-28 18:17:46 +00:00
Ray Speth
403cbc74fc Remove outdated 'mixmaster' script 
This script was for the legacy Python module only.
 2014-04-14 18:37:49 +00:00
Ray Speth
f9278b7e68 Remove unused 'install_tsc' script 2014-01-30 00:47:44 +00:00
Ray Speth
8b435f6dcb [SCons] Fix a problem with Cantera.mak and user-provided BLAS/LAPACK 
All cases need to define the mak_blas_lapack_libs_dep variable that
was introduced in r2535.
 2013-10-21 01:55:47 +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
5720d7cf90 Fixed an error where the users data was changed before it was used. 
Eliminated some deprecations which were not sanctioned.

Worked on Cantera.mak. There is a problem with scons eliminating $ from strings.
 2013-09-06 22:52:59 +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
a22ceda566 [Scons] Fix build order dependencies for python modules 2013-08-14 17:55:51 +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
c084148b0e [SCons] Python module can be installed to user's site-packages directory 
Setting the scons options 'python_prefix=USER' or 'python3_prefix=USER' will
pass the '--user' flag to setup.py, causing the Python module to be installed to
a platform-specific directory on the user's module path.
 2013-03-04 17:31:08 +00:00
Ray Speth
978e3605bd [SCons] Cleanup of the build scripts 2013-02-01 23:39:53 +00:00
Ray Speth
55dec034ed Merge branch '2.0' into 'trunk' 
Conflicts:
	README
	SConstruct
	configure.ac
	doc/sphinx/conf.py
 2012-12-13 22:58:38 +00:00
Ray Speth
180d5c4813 [SCons] Fixed generation of library list in cantera.pc 
Now includes cvode, sundials, ctlapack, etc. as necessary depending on the SCons
options specified.
 2012-12-12 19:16:02 +00:00
Ray Speth
53891d0b23 [SCons] Include libexecstream in pkg-config libraries 2012-12-07 15:02:55 +00:00
Harry Moffat
08a41f191c Added back constructPhaseFile() and constructPhaseXML(). 
All molten salt problems were broken and some brine problems were broken.
 2012-11-07 23:51:30 +00:00
Ray Speth
548749d080 Fixed an error building Cantera.mak when 'build_with_f2c' is True 2012-08-14 21:49:00 +00:00
Ray Speth
a79428f894 Fixed some issues with paths in Cantera.mak and cantera.pc 2012-08-13 20:14:14 +00:00
Ray Speth
b1f480daa5 Fixed Cantera.mak when using the 'single_library=y' config option 
cherry-pick of r1633 from 2.0 maintenance branch
 2012-08-13 20:14:00 +00:00
Ray Speth
1bae2a373c Fixed Cantera.mak when using the 'single_library=y' config option 2012-07-10 16:23:21 +00:00
Ray Speth
205312e632 Generate cantera.pc for use with pkg-config 2012-06-12 22:48:51 +00:00
Ray Speth
1fb14fc86a Skip building/installing some targets when layout=debian 
Do not build the shared library.
Do not build csvdiff.
Do not install install_tsc
Do not install man pages (handled by debhelper)

Skip csvdiff for Debian package

More things not installed with Debian
 2012-06-05 19:56:34 +00:00
Ray Speth
ec1abb55a1 Added debian file layout option 2012-06-05 19:56:30 +00:00
Ray Speth
1ba0deca74 Fixed python module location in post-install message and setup_cantera script 2012-04-26 21:20:00 +00:00
Harry Moffat
25ba149aab Sorry for monolithic commit. Will break it up in the future. 
Moved the external libraries to separate library files so that libcantera.a just contains its own namespace externals.

Fixed several errors in the equilibrium program that occurred during the port. (int to size_t issues).

Moved some equilibrium program headers to the include file system, so that it can link with equilibrium program.

Worked on Cantera.mak. Needs more work.

Fixed an issue with the Residual virtual base classes within numerics. They didn't inherit due to int to size_t migration. This caused numerous test problems to fail (issue with backwards compatibility - do we want it and how much do we want?).

Added csvdiff back so that it's available for shell environment runtests.
 2012-04-05 00:24:31 +00:00
Ray Speth
04841e181c Fixed generating Cantera.mak on OS X 2012-03-15 19:55:34 +00:00
Ray Speth
3be53356a2 Updated sample build scripts to include pthread where necessary 2012-03-09 22:59:50 +00:00
Ray Speth
8150f49c2c Simplified adding SCons build and install targets 2012-03-05 20:45:20 +00:00
Ray Speth
45fe098d51 Added example Makefiles to install with C++ sample programs 2012-03-01 00:44:56 +00:00
Ray Speth
1ece5bcc3d Some changes to make SCons faster 2012-02-23 21:25:20 +00:00
Ray Speth
eb2cab5f2b Updates to SCons scripts to support the new directory structure 2012-02-12 02:46:40 +00:00