Commit graph

48 commits

Author SHA1 Message Date
Ray Speth
ecbfecd7fd Replace existing copyright notices with uniform copyright/license info 2016-10-10 22:19:01 -04:00
Ray Speth
aa5f26bda6 [Thermo] Check dynamic_cast to PDSS_Water
Resolves #6
2016-05-03 15:03:52 -04:00
Ray Speth
80fcc92129 [Thermo] Deprecated constructPhaseFile and constructPhaseXML methods
These methods were only defined for HMWSoln and IonsFromNeturalVPSSTP, and just
do the same thing as initThermoFile and importPhase (respectively).
2016-04-16 22:08:39 -04:00
Ray Speth
4382ae6c85 Clean up comments in Thermo class source files 2015-11-09 17:34:46 -05:00
Ray Speth
0647823ada Replace DATA_PTR macro with calls to data() 2015-10-17 18:58:50 -04:00
Ray Speth
fb4eece9f8 Use std::unique_ptr instead of raw pointers where appropriate 2015-10-14 18:45:23 -04:00
Ray Speth
2589a27b6c Use range-based for and auto to simplify some loops 2015-10-14 18:45:23 -04:00
Ray Speth
7fe8f0f3b7 [Thermo] Refactor common initialization out of constructors 2015-08-05 12:09:02 -04:00
Ray Speth
acdf9cf0ed Clean up interstitial whitespace
Remove extra space around operators, between words, etc.
2015-08-02 23:06:16 -04:00
Ray Speth
6a04193646 Fix un-bracketed if, for, and else statements 2015-08-02 23:06:15 -04:00
Ray Speth
801334c84e Merge nested if statements 2015-08-02 23:06:15 -04:00
Ray Speth
546eede80c Fix pointer logic errors in initThermoXML
Affects DebyeHuckel and HMWSoln
2015-08-02 23:06:15 -04:00
Ray Speth
e4c45b6429 General whitespace cleanup
Remove unnecessary blank lines and trailing whitespace. Replace tabs with
spaces.
2015-08-02 23:06:15 -04:00
Ray Speth
d086be8d3d Eliminate do-while loops in favor of regular while loops 2015-08-02 23:06:15 -04:00
Ray Speth
c3c80f79fb Remove extraneous parentheses 2015-08-02 23:06:14 -04:00
Ray Speth
bf2ceed60e Remove some leftover debugging ifdefs 2015-07-20 15:47:17 -04:00
Ray Speth
5214672ab3 Merge namespace ctml with namespace Cantera 2015-05-27 18:09:07 -04:00
Ray Speth
d7cbb30086 Eliminate unnecessary manual memory management of XML_Node
This also eliminates memory leaks that would occur if an exception were raised
in these methods.
2015-02-20 00:11:19 +00:00
Ray Speth
7acf0378c6 [Thermo] Improve usage of local variables
Also eliminate some unnecessary temporary variables.
2015-02-12 04:04:18 +00:00
Ray Speth
ba42bc6da2 [Doc] Remove suppression of Doxygen autolinking
In those cases where the name is actually a reference to the class, we actually
want Doxygen to apply formatting to the name and link to the class's
documentation, so we shouldn't suppress that behavior with the prepended '%'.
2014-12-05 23:33:24 +00:00
Ray Speth
55fab6ca83 Deprecate unused return value of importPhase 2014-10-03 22:15:08 +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
83e38480d6 Throw exceptions instead of calling std::exit after an error
By throwing an exception, Cantera is better behaved when used within other
applications, e.g. as in the case of the Matlab and Python interfaces.
2014-06-06 00:17:58 +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
95eb7ab3ba Remove newline after '::' in member function definitions
This inconsistency makes it hard to directly search the code for a specific
member function definition.
2014-03-24 04:03:09 +00:00
Ray Speth
d516d46f33 Remove unnecessary use of static_cast<int> 2014-01-31 23:15:09 +00:00
Ray Speth
d253fc0d63 Eliminate redundant standard library includes 2013-06-05 17:08:13 +00:00
Ray Speth
ee74c80afc Fixed a number of "shadowed variable" compiler warnings 2013-04-18 22:08:36 +00:00
Ray Speth
7b7d3ac0d4 Fixed locale-dependent processing of XML files
Floating point values are read using a std::stringstream imbued with the "C"
locale to avoid problems with using std::atof when the user's locale uses a
character other than "." as the decimal separator.

Patch provided by Phillip Berndt.

Fixes Issue 153.
2013-04-03 23:10:18 +00:00
Ray Speth
4e3a79394b Eliminated some shadowing of member variables by function arguments 2013-02-14 01:03:19 +00:00
Ray Speth
70b08a6891 Eliminated some local variable shadowing 2013-02-14 01:03:13 +00:00
Ray Speth
8a17523715 Use the "charge" member function consistently to access species charges
Eliminated local alias to array of charges in some functions. Inlined the
"charge" function to mitigate any performance impact. Fixes a number of shadowed
variable warnings.
2013-02-14 01:03:09 +00:00
Ray Speth
da33cc66c3 Cleaned up Doxygen docs for class VPStandardStateTP and descendants 2013-02-14 01:02:34 +00:00
Ray Speth
7da738d238 Re-applied consistent formatting to trunk
Applied using: astyle -n --style=kr --add-brackets --indent=spaces=4
--indent-col1-comments --unpad-paren --pad-header --align-pointer=type
--lineend=linux
2013-02-07 23:40:59 +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
1d19803885 Pass "const std::string&" instead of "std::string" when possible 2012-10-24 15:42:51 +00:00
Ray Speth
85d9d360c7 Fixed a bunch of spelling issues 2012-08-17 16:43:34 +00:00
Ray Speth
fa22d8fde1 Removed constructPhaseFile and constructPhaseXML methods from HMWSoln 2012-08-08 22:16:04 +00:00
Ray Speth
8ea4ae728a Moved a few standard library includes to more local scopes 2012-03-23 22:16:04 +00:00
Ray Speth
78a093b485 Folded class Constituents into class Phase 2012-03-09 22:56:11 +00:00
Ray Speth
3bff32dd55 Fixed problems that generated warnings with the Intel compiler 2012-03-07 00:51:13 +00:00
Ray Speth
236756fbf0 Removed rogue tabs in the C++ source code 2012-02-27 18:15:02 +00:00
Ray Speth
7f12656925 Fixed some self-assignment errors 2012-02-27 18:14:35 +00:00
Ray Speth
35429de71c Fixed a bunch of spelling errors in the documentation and comments 2012-02-21 16:04:09 +00:00
Ray Speth
9bc4a261c7 Fixed a bunch of GCC warnings 2012-02-15 20:28:08 +00:00
Ray Speth
a310345b9e Updated #includes to reflect new header file locations 2012-02-12 02:44:14 +00:00
Ray Speth
2528df0f75 Reorganized source tree structure
These changes make it unnecessary to copy header files around during
the build process, which tends to confuse IDEs and debuggers. The
headers which comprise Cantera's external C++ interface are now in
the 'include' directory.

All of the samples and demos are now in the 'samples' subdirectory.
2012-02-12 02:27:14 +00:00
Renamed from Cantera/src/thermo/HMWSoln_input.cpp (Browse further)