Commit graph

4766 commits

Author SHA1 Message Date
Ray Speth
2ca0dc0ed1 [Doc] Update version specified in git/svn checkout commands
Cherry-pick of trunk r2920.
2014-04-29 19:03:17 +00:00
Ray Speth
ff97133592 [Doc] Add note about how to fix Sundials CMakeLists.txt
The Sundials CMakeLists.txt was not correctly updated for the 2.5.0 release, and
builds a version of Sundials that still claims to be 2.4.0. This leads to
compilation errors since some Sundials functions have changed signatures between
2.4 and 2.5, and Canteran needs to distinguish between the two.

Cherry-pick of trunk r2887.
2014-04-29 19:02:58 +00:00
Ray Speth
e0f9888601 [ck2cti] Make 'PCHEB' and 'TCHEB' keywords case insensitive
Fixes Issue 213.

Cherry-pick of trunk r2878.
2014-04-29 19:02:38 +00:00
Ray Speth
a1f4d6f110 [Thermo] Check composition strings for invalid float literals
Cherry-pick of trunk r2866
2014-04-29 19:02:23 +00:00
Ray Speth
cc324285d2 [SCons] Workaround SCons dependency bug with Cygwin
Cherry-pick of trunk r2862
2014-04-29 19:02:09 +00:00
Ray Speth
e59ca5ff6b [ck2cti] Improve error messages associated with missing input files
Partial cherry-pick of trunk r2856.
2014-04-29 19:02:02 +00:00
Ray Speth
953fc46c27 Revert commit intended for trunk that ended up on 2.1 maintenance branch
Reverts r2879, which was actually commited to trunk in r2913.
2014-04-25 20:46:47 +00:00
Steven DeCaluwe
1d0a4711ac Added gas-phse kinetics to RedlichKwongMFTP class 2014-04-09 13:11:35 +00:00
Ray Speth
0581743084 [Doc] Add class Mixture to Sphinx docs
Cherry pick of trunk r2740.
2014-04-02 15:22:49 +00:00
Ray Speth
70e0553792 [Numerics] Fix invalid dereference in SquareMatrix::factor
The work array hasn't always been allocated, so taking its address isn't
necessarily valid. Also, dlange doesn't use the work array in the '1' norm
case anyway.

Cherry-pick of trunk commit 2830.
2014-03-24 21:37:16 +00:00
Ray Speth
fe858b39f3 [Test] Fix platform-dependent output in test-IAPWSPres
Cherry-pick of trunk commit r2822.
2014-03-24 21:37:10 +00:00
Ray Speth
1b0519e662 [ctml_writer] Fix handling of units in some fields
When using Python 3, using -1 as the dummy value for density and site_density
causes probems, because the (ordered) comparison between a density specified
with units (as a tuple) and 0 is not allowed. Instead, use None as the
placeholder value.

Cherry-pick of trunk commit r2800.
2014-03-24 21:37:00 +00:00
Ray Speth
5795f3fd55 [Python] Fix docstring of Sim1D.restore
Resolves Issue 210.

Cherry-pick of trunk commit r2790.
2014-03-24 21:36:55 +00:00
Ray Speth
98d113182b [Thermo] Fix possible invalid read in installShomateThermoFromXML
installShomateThermoFromXML now checks that 7 coefficients are supplied in the
floatArray and throws if that is not the case.

Partial cherry-pick of r2778.
2014-03-24 21:36:48 +00:00
Ray Speth
7f5ea6edb3 Fix version displayed by Doxygen docs 2014-02-24 03:51:42 +00:00
Ray Speth
26c6aa856f [Doc] Point to SourceForge for downloads 2014-02-24 03:27:49 +00:00
Ray Speth
c03b67751d Bump version to 2.1.1 2014-02-24 03:27:45 +00:00
Ray Speth
98746058f5 Mention downloads on Sourceforge in README 2014-02-24 03:27:41 +00:00
Ray Speth
5f62e95034 [SCons] Always link to static standard libraries with MinGW 2014-02-24 03:27:36 +00:00
Ray Speth
a3d0176087 [SCons] Ensure that 'compilerOpt' is always defined 2014-02-24 03:27:32 +00:00
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