Commit graph

182 commits

Author SHA1 Message Date
Ray Speth
8dcde36d20 Fix invalid iterator usage in Application::close_XML_File
The iterator 'b' is invalidated by calling erase(b), which means that the
subsequent call to ++b results in undefined behavior. This was identified by
segfaults in the Matlab unit test on OS X.
2015-06-08 17:20:54 -04:00
Ray Speth
911c2f180d Remove unused, redundant 'g_DEBUG_MODE' variable
This is exactly the same as the DEBUG_MODE_ENABLED macro
2015-05-29 16:29:57 -04:00
Ray Speth
5214672ab3 Merge namespace ctml with namespace Cantera 2015-05-27 18:09:07 -04:00
Ray Speth
1c878c16de Fix issues indicated by compiler warnings 2015-05-26 11:42:20 -04:00
Ray Speth
341b137766 [Doc] Capitalize proper nouns and acronyms 2015-05-25 20:58:44 -04:00
Ray Speth
aa2b732954 Fix directories searched for input files on Windows
Update to use the registry key for Cantera 2.2. The 'templates'
subdirectory no longer exists.

Fix documentation to not incorrectly claim that COMMONPROGRAMFILES
will be searched for input files.
2015-05-24 18:23:24 -04:00
Ray Speth
decf251a8b Improve error messages generated by XML_NoChild and XML_TagMismatch 2015-05-02 20:07:46 -04:00
Ray Speth
f3eaef1675 [CTI] Strip leading whitespace when converting CTI strings
Leading whitespace would normally result in a Python IndentationError.
2015-04-20 18:34:39 -04:00
Ray Speth
b0e5b13913 Remove redundant, unnamed root XML node from parsed documents
XML_Node::build will make that node the root node (i.e. the 'ctml' node)
of the tree, instead of giving that node a child node containing the actual
root node.
2015-04-20 18:34:39 -04:00
Ray Speth
39b93d3690 Allow XML documents without an XML declaration node 2015-04-20 18:34:38 -04:00
Ray Speth
2e53890adf Minor cleanup of constructors and destructors 2015-02-26 21:58:42 +00:00
Ray Speth
cc17716182 Cleanup trailing whitespace 2015-02-26 21:52:52 +00:00
Ray Speth
efb80dfe05 Remove unnecessary delimiter lines between functions
A single line of white space is sufficient and consistent. Also moved a couple
Doxygen strings out of source files.
2015-01-22 00:04:24 +00:00
Ray Speth
b8a99b4b83 Remove unnecessary explicit calls to default constructors 2015-01-22 00:04:12 +00:00
Ray Speth
ddfc15bb77 Allow CANTERA_DATA to include multiple directories 2014-12-12 01:36:56 +00:00
Ray Speth
ced2d20dd8 Use XML_Node::attrib when it is more clear than using operator[] 2014-11-15 00:47:31 +00:00
Ray Speth
8b8a95a2ff Deprecate unused stringUtils functions 2014-11-07 02:14:57 +00:00
Ray Speth
07f8d520ee Improved implementation of parseCompString
Improvements:

- Tolerate formatting irregularities such as spaces befpre or after the colon
  (e.g. 'H2: 1.0')

- Allow names containing commas and semicolons

- Detect errors such as no value being supplied for the last element (e.g. 'H2')

- Single implementation handles both the case where a list of valid names is
  supplied and when any name is allowed
2014-11-07 02:14:52 +00:00
Ray Speth
a208c54d1c Add a version of XML_Node::getChildren with a simpler interface 2014-10-22 21:48:04 +00:00
Ray Speth
26b6f190f3 Introduce class Species 2014-10-17 23:44:31 +00:00
Ray Speth
c4a5f2667f Remove CTML_VERSION macros
CTML_VERSION_1_4_1 was never used, and defining CTML_VERSION_1_4 broke reading
values written by the addInteger and addFloat functions with the getInteger and
getFloat functions, respectively.
2014-10-08 16:54:42 +00:00
Ray Speth
4910b1bc1c Fix compilation with Visual Studio 2013
Fixes regression introduced in r3125.

Resolves Issue 240.
2014-10-03 16:48:21 +00:00
Ray Speth
5b1b08849c Additional uses for getValue with default value 2014-10-03 01:45:54 +00:00
Ray Speth
8bb65e4cee Add user-specified directories to the beginning of the search path
This way, users are able to override the defaults.
2014-09-23 02:20:45 +00:00
Ray Speth
2fc09337c0 Deprecate XML_Node::operator() 2014-09-15 18:04:57 +00:00
Ray Speth
002c158761 Cleanup include statements
Move includes from header to implementation files where possible, and remove
unnecessary includes.
2014-08-28 16:54:13 +00:00
Ray Speth
5505b791b7 Make get_XML_Node search for both XML and CTI input file formats
This makes it possible to use species and reactions from external CTI files,
rather than only external XML files, since the datasrc extension assumed in the
cti->xml conversion is .xml.
2014-08-28 16:54:08 +00:00
Harry Moffat
9e05e85b66 Fixed a typo in HAVE_FENV_H implementation 2014-08-26 20:54:52 +00:00
Harry Moffat
08fe85b4cd Check for fenv.h availability. Apparently, MS visual doesn't have C99 support before 2013, so previous commit didn't compile on MSVISUAL.
If fenv.h not available, program now error exits if fenv functions are requested.
2014-08-26 17:55:44 +00:00
Harry Moffat
e129d02d93 Added in real number overflow exception control.
There are a series of activity coefficients for published battery models
 which actually overflows. Cantera was treating this as a nonerror and changing
the return results without comment. This is not correct. Made the behavior a
user controlled capability.
2014-08-05 23:42:24 +00:00
Ray Speth
907bbd8b79 Allow importing phases from XML or CTI strings 2014-07-30 16:59:51 +00:00
Ray Speth
232e28d2c8 Check file modification time before reusing cached XML 2014-07-30 16:59:04 +00:00
Ray Speth
063c2a261a Eliminate redundancy between get_XML_File and get_CTML_Tree
get_CTML_Tree and getCtmlTree are now deprecated in favor of get_XML_File
2014-07-30 16:58:55 +00:00
Ray Speth
6866725b57 Simplify implementation of get_XML_File
This is easier now that we don't have to write the XML file to disk
when importing from a CTI file.
2014-07-30 16:58:52 +00:00
Ray Speth
67539df9f2 Fix #includes to work with Visual Studio 2013 2014-07-25 18:32:57 +00:00
Ray Speth
19e3a09980 Allow '~/' as alias for user's home directory when importing cti/xml 2014-07-10 22:33:20 +00:00
Ray Speth
a470502932 [Transport] Replace transport_log.xml with regular text logging
Write plain text to the common Cantera logger to be more consistent with the
verbose/debug logging from other parts of Cantera. This simplifies several of
the transport initialization functions, and eliminates the need for class
XML_Writer.
2014-06-20 18:44:59 +00:00
Ray Speth
3349a28d38 Update some deprecation warnings. 2014-06-20 18:44:39 +00:00
Ray Speth
e778afad32 Remove deprecated functions 2014-06-20 18:44:33 +00:00
Ray Speth
4b9e4da822 Fix some compiler warnings 2014-05-27 02:53:35 +00:00
Ray Speth
6c0cea5ee4 Standardize function used for writing a line of repeated characters 2014-05-27 02:53:06 +00:00
Ray Speth
789574ac80 Remove commented-out code 2014-05-27 02:52:21 +00:00
Harry Moffat
675df76b1c Fixed a long standing problem with the combination of storred XML files and duplicator functions.
Now the complete XML file is storred within the ThermPhase object starting with the root node.
This is needed for later processing of kinetics and transport mechanisms when the ThermoPhase
file is duplicated and the original file is deleted.

xml() is now a const function, and still returns the same pointer.
setXMLdata() is a new function will stores the xml data.
2014-05-20 19:02:20 +00:00
Ray Speth
7fff65cecd Remove previously-deprecated 'PrintCtrl' and 'LogPrintCtrl' classes. 2014-05-08 23:01:32 +00:00
Ray Speth
54ded64e4b Miscellaneous whitespace cleanup 2014-05-08 23:01:12 +00:00
Ray Speth
bc0346eae7 Avoid deadlocks in cti to ctml conversions on Windows 2014-05-06 14:39:48 +00:00
Ray Speth
8cfac61a83 Use configuration checks to determine names for 'isnan' and 'finite' 2014-05-03 17:39:33 +00:00
Ray Speth
beeaa21644 Deprecate unused stringUtils functions 2014-04-02 15:26:42 +00:00
Ray Speth
43546f870f fpValueCheck detects (invalid) decimal ponts in exponents 2014-04-02 15:26:31 +00:00
Ray Speth
4a6dd84f81 [Thermo] Check composition strings for invalid float literals 2014-04-02 15:26:20 +00:00