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

4746 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Speth
714fe7f35f [SCons] Workaround for SCons bug under Cygwin 
See SCons Issue 2911.
http://scons.tigris.org/issues/show_bug.cgi?id=2911

Cherry-pick of trunk r2739.
 2014-02-24 03:27:28 +00:00
Ray Speth
214e3c8af7 [SCons] Fix library linking issues under Cygwin 
Partial cherry-pick of trunk r2738.
 2014-02-24 03:27:25 +00:00
Ray Speth
5441577624 Fix compilation errors with isnan/isinf using Cygwin's GCC 
Cherry-pick of trunk r2737.
 2014-02-24 03:27:21 +00:00
Ray Speth
f3b877d0a1 [SCons] Correctly identify Cygwin builds 
The correct preprocessor macro to use is the one provided by the
compiler, '__CYGWIN__'.

Cherry-pick of trunk r2736.
 2014-02-24 03:27:17 +00:00
Ray Speth
2861a8a633 [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. This is also a workaround for a SCons bug on
Cygwin.

Cherry-pick of trunk r2735.
 2014-02-24 03:27:10 +00:00
Ray Speth
73e20dc1eb [SCons] Fix a missing SCons dependency 
Cherry-pick of trunk r2734.
 2014-02-24 03:27:06 +00:00
Ray Speth
3b2c7d3ae2 [SCons] Fix simultaneous compilation of Python 2 and Python 3 modules 
Use separate SCons Environments so the 'py_include_dirs' variable (which
contains the Numpy include directory) can be distinct for each Python module.

Cherry-pick of trunk r2710.
 2014-02-14 17:02:25 +00:00
Ray Speth
261240e8f1 [MixMaster] Fixes to use Cython function names 
DataFrame.importCSV and dataFrame.importData were still using function names
from the old Python module.

Cherry-pick of trunk r2729.
 2014-02-14 17:02:21 +00:00
Ray Speth
659bceb9cf [MixMaster] Fix usage of numpy.zeros and numpy.ones 
Cherry pick of trunk r2728.
 2014-02-14 17:02:16 +00:00
Ray Speth
c7efc2d059 [Matlab] Fix detection of errors when importing Kinetics 
Cast the unsigned return type of newKineticsFromXML to a signed type so that the
check on the Matlab side (which looks at the sign of the return value) can
detect and report errors.

Cherry-pick of trunk r2724.
 2014-02-13 22:39:38 +00:00
Ray Speth
849dc5c82f [Cython] Add saveState/restoreState info to the migration guide 
Cherry pick of trunk r2722.
 2014-02-13 22:39:34 +00:00
Ray Speth
cc27095599 [ck2cti] Fix support for species names containing '+' and '=' 
This addesses a parsing error that would occur if a mechanism contained both
'foo' and 'foo+', where reactions written as 'foo+bar' would be parsed as a
reaction with 'foo+' and 'bar'.

See Issue 182.

Cherry pick of trunk commit r2701.
 2014-02-03 17:04:48 +00:00
Ray Speth
ee736fb306 Fix potential segmentation fault and invalid read. 
Cherry-pick of trunk r2676.
 2014-01-23 03:06:29 +00:00
Ray Speth
0590c6c1a3 [ck2cti] Fix for support of unterminated thermo sections 
Fixes the case where the next section header contains a modifier, e.g. 'thermo
all' or 'reactions <units>'.

Based on a patch provided by Bryan Weber.

See Issue 199.

Cherry-pick of trunk r2662.
 2014-01-23 03:06:23 +00:00
Ray Speth
a23eac62d8 [ck2cti] Improve handling of duplicate species 
Warn when a species is given multiple times in the input list. Do not add the
duplicate species to speciesList.

Based on patch provided by Bryan Weber.

Resolves Issue 199.

Cherry-pick of trunk r2660.
 2014-01-23 03:06:16 +00:00
Ray Speth
f988382b36 [Matlab] Check for sparse arrays in the Solution 'set' function 
Patch provided by Bryan Weber.

Resolves Issue 140.

Cherry-pick of trunk r2659.
 2014-01-23 03:06:11 +00:00
Ray Speth
d3dfc3f608 [SCons] Fix Matlab-related paths in post-install message 
Cherry-pick of trunk r2641.
 2014-01-23 03:06:05 +00:00
Ray Speth
227a792326 [Kinetics] Fix reaction path output when arrow_width > 0 
Fixes Issue 197.

Cherry-pick of trunk r2640.
 2014-01-23 03:06:01 +00:00
Ray Speth
f8754904dd [Reactor] Make default wall area 1.0 m^2 
This makes the default consistent with the documentation in the Python
module. Reported by & patch from Bryan Weber.

Fixes Issue 194.

Cherry-pick of trunk r2614.
 2014-01-23 03:05:57 +00:00
Ray Speth
5fbbd30747 [Doc] Cherry-pick of corrections to the documentation 
Cherry pick of trunk revisions: r2607, r2608, r2620, r2621, r2622, r2623, r2624,
r2625, r2628, r2630, r2632, r2633, r2635, r2636.
 2014-01-23 02:45:23 +00:00
Ray Speth
d190633c47 Fix missing include in csvdiff 
"std::exit" is declared in <cstdlib>. Fixes compilation errors on OS X 10.9.

Cherry-pick of trunk r2666.
 2014-01-23 02:13:56 +00:00
Ray Speth
c865843d8a [Cython] Fix compilation issue when using Clang 
Cherry-pick of trunk r2663.
 2014-01-23 02:13:51 +00:00
Ray Speth
2628cb760c [SCons] Add Boost libraries when building the shared library 
Cherry-pick of trunk r2670.
 2014-01-23 02:13:46 +00:00
Ray Speth
2d7d82d633 [SCons] Install Python 3 module to stage directory 
Cherry-pick of trunk r2671.
 2014-01-23 02:13:40 +00:00
Ray Speth
5109d0d5a4 [Test] Update gtest to 1.7.0 
Cherry-pick of trunk r2680.
 2014-01-23 02:12:44 +00:00
Ray Speth
9f156c04fc [Thermo] Make modification of discontinuous NASA polynomials optional 
Adding the attribute allow_discontinuities="true" to a phase's
'thermo' node (CTML) or adding 'allow_discontinuous_thermo' to a
phase's 'options' argument (CTI) will disable the automatic adjustment
of the provided polynomials so that enthalpy and entropy are
continuous at the midpoint temperature.

Cherry-pick of trunk r2590.
 2014-01-23 02:12:36 +00:00
Ray Speth
5386d6b304 [ctml] Fix constructor for stoichiometric_solid phase 
Error introduced in r2579
 2013-12-06 23:45:22 +00:00
Ray Speth
81cf00260d [ck2cti] Add support for species names containing '+' and '=' 2013-12-06 23:15:24 +00:00
Ray Speth
44181d5edf [ck2cti/Test] Eliminate confusing messages from expected errors 
Suppress error messages from tests of ck2cti that use bad input to
test that input validation is working correctly.
 2013-12-06 23:15:21 +00:00
Ray Speth
c9b4d3dbe8 [ck2cti] Add support for truncated section header names 
Accept truncated section names such as 'REAC' for 'REACTIONS' and
'ELEM' for 'ELEMENTS'.
 2013-12-06 23:15:18 +00:00
Ray Speth
ff842a1a08 [Cython] Direct log output to sys.stdout 
This fixes the problem of some output (notably from the 1D solver)
going to std::cout when that is not the primary output location,
e.g. when using IDLE or the IPython QtConsole.
 2013-12-06 23:15:14 +00:00
Ray Speth
3f92b77f5a [Thermo] Fix printed labels in phase report when show_thermo=False 2013-12-06 23:15:11 +00:00
Ray Speth
58a4183e55 [Matlab] Remove broken ck2ctml function 
There are three problems with this function. It does not work, since
it calls ctmethods with the wrong number of arguments. Even if that
were fixed, it wouldn't do what it claims, as the method it calls
generates a CTI file, not an XML file. Finally, it is redundant, as
the 'ck2cti' function can be used for generating the CTI file, and the
CTI to XML conversion is handled automatically when importing the
phase.

Therefore, this function is being removed.
 2013-12-06 23:15:08 +00:00
Ray Speth
7ce65f45d8 [Python/Test] Run tests that were being accidentally ignored 2013-12-05 20:54:11 +00:00
Ray Speth
a8111887bf [CTI] Add optional 'note' field to Phase definitions 
The note field is preserved when converting to XML, and can be used to
store extra information used by applications other than Cantera.
 2013-12-05 20:54:08 +00:00
Ray Speth
c7d69ac863 [Cython] Expose global 'appdelete' method 
Occasionally useful for debugging memory leaks
 2013-12-05 20:54:06 +00:00
Ray Speth
b914d59fbd [Docs] Fix typos in a few equations 2013-12-05 20:54:03 +00:00
Ray Speth
bec6e97eb4 [Matlab/Samples] Fix tolerances on flame example 2013-12-05 20:54:01 +00:00
Ray Speth
cd572403df Fix issues with pure fluids near temperature limits 
Fixes Issue 186.
 2013-11-12 23:44:51 +00:00
Ray Speth
a7bd7c6a7a [Cython] Add 'atomic_weight' method and 'atomic_weights' property 
Resolves Issue 185.
 2013-11-12 23:44:46 +00:00
Ray Speth
cf429ac374 Fix CXX flags for VS2012 
Resolves Issue 184.
 2013-11-12 23:44:42 +00:00
Ray Speth
d76ae30e86 [Cython/Doc] Migration guide covers transport model and Soret effect 2013-11-03 21:06:54 +00:00
Ray Speth
3a0c370550 [Matlab] Fix 'thermalConductivity' method 2013-11-03 20:46:38 +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
904e3e66e9 [ck2cti] Accept reaction units declared in either order 
That is, energy followed by quantity or quantity followed by energy.
 2013-10-21 22:13:00 +00:00
Ray Speth
c885a88817 Use fully qualified names for isnan, isinf, and finite 
Specify the versions in the global namespace, to avoid ambiguity
between these and the versions in namespace std that are available in
C++11.
 2013-10-21 22:12:57 +00:00
Ray Speth
94f1b35b79 [ck2cti] Partial support for scientific notation in stoichiometric coefficients 
This won't work for positive exponents, because the '+' will still be
interpreted as a delimiter between terms of the reaction expression.
 2013-10-21 01:55:18 +00:00
Ray Speth
6d5b7999de [SCons] Use specified 'python_compiler' to link Python module 
Fixes Issue 179.
 2013-10-15 17:06:35 +00:00
Ray Speth
f871dd8cf0 [SCons] Add 'python_compiler' option for Cython module compilation 2013-10-15 14:59:31 +00:00