Commit graph

59 commits

Author SHA1 Message Date
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
0542e694a9 [Thermo] Merge classes StoichSubstance and StoichSubstanceSSTP
Use the implementation of StoichSubstanceSSTP (descended from
SingleSpeciesTP) but change the name to StoichSubstance.
2015-10-19 00:17:40 -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
3f6d8b0aca Use cppformat instead of int2str and fp2str 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
c2ba24c0c2 Fix possible memory leak in newPhase
If importPhase threw an exception, then the ThermoPhase object allocated here
would not be deleted. Switching to a smart pointer fixes this problem.
2015-10-14 18:45:23 -04:00
Ray Speth
bfb20e1f50 Consistently use vector_fp and vector_int typedefs 2015-08-02 23:06:16 -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
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
546289f737 Remove deprecated code with functional alternatives 2015-07-13 18:59:09 -04:00
Ray Speth
5214672ab3 Merge namespace ctml with namespace Cantera 2015-05-27 18:09:07 -04:00
Ray Speth
341b137766 [Doc] Capitalize proper nouns and acronyms 2015-05-25 20:58:44 -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
2ca603838d [Thermo] Extract 'newSpecies(XML_Node&) from thermo initialization
VPStandardStateTP phases now use the same pathway for adding species as
other phase in importPhase. Deprecate the now-unused 'installSpecies'
function.
2015-04-20 18:34:37 -04:00
Ray Speth
a63874e4b4 [Transport] Refactor TransportData initialization 2015-04-20 18:34:36 -04:00
Ray Speth
aee6cc14ac [Transport] Remove 'name' variable from TransportData
This was used only for validation error messages, but in that case we can just
use the Species object which is available during validation.
2015-04-17 19:06:43 -04:00
Ray Speth
7d170a9989 [Thermo] newSpeciesThermoInterpType argument is the 'thermo' XML node
No data from the outer 'species' node is needed to instantiate the
SpeciesThermoInterpType object, so this function can just take the 'thermo' node
directly.
2015-04-17 19:06:43 -04:00
Ray Speth
882a4986da Remove 'thermo' argument from Species constructor
Since the Species object now stores its SpeciesThermoInterpType contents as a
shared_ptr, it is undesirable to have the Species constructor take this as a raw
pointer argument.
2015-04-14 15:29:28 -04:00
Ray Speth
43952b30fc [Thermo] Use shared_ptr<Species> in ThermoPhase 2015-04-14 15:29:28 -04: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
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
8022e9e01e [Transport] Add gas phase transport parameters to Species objects 2015-01-08 23:36:22 +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
a208c54d1c Add a version of XML_Node::getChildren with a simpler interface 2014-10-22 21:48:04 +00:00
Ray Speth
7d9a6eeefc Deprecate class SpeciesThermoFactory 2014-10-17 23:44:56 +00:00
Ray Speth
4dd3e1d2bc Use Species objects when adding species from XML 2014-10-17 23:44:47 +00:00
Ray Speth
53abe2ee9a [Thermo] Always use GeneralSpeciesThermo
The specialized SpeciesThermo derived types offer no performance benefit now
that GeneralSpeciesThermo manages calculation of the temperature terms
efficiently.
2014-10-15 02:03:06 +00:00
Ray Speth
43f022384c Add version of installVPThermoForSpecies without unused arguments
Deprecate the old version of SpeciesThermoFactory::installVPThermoForSpecies.
2014-10-08 16:54:44 +00:00
Ray Speth
4baccc732c [Thermo] Simplify interface for adding elements to a Phase
Phase::addElements(string name, ...) is the single entry point for adding
elements. It always perform the uniqueness check, and can do the extra
additional work required to add elements to a phase that already has species,
removing the need for "freezing" the phase's elements. Parsing the XML tree for
elements is now handled in "installElements". The variant element-adding methods
are deprecated.
2014-09-27 00:09:05 +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
14fe11d661 [Thermo] Miscellaneous cleanup of ThermoFactory 2014-03-28 23:13:11 +00:00
Victor Brunini
93fcf181b1 Initial pass at implementing Maskell solid solution ThermoPhase.
Based on Maskell, Shaw, and Tye, Electrochimica Acta 28(2) 225-230 1983.
Includes unit tests checking calculation of the chemical potential values
and parsing of the mixing enthalpy parameter from an XML file.
2014-02-28 00:38:09 +00:00
Ray Speth
d516d46f33 Remove unnecessary use of static_cast<int> 2014-01-31 23:15:09 +00:00
Harry Moffat
7e88d49734 Took out change of user NASA polynomials.
This violates basic paradigm of what the user inputs the user gets.
If this is necessary, this needs to be a cpp utility program that is run before the main simulation.
2014-01-03 20:57:40 +00:00
Ray Speth
3e4ccd4027 [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.
2013-12-09 01:34:06 +00:00
Ray Speth
5fff5ce99f [Thermo] Slightly simplify adding species
Eliminate the freezeSpecies and init methods of class Phase, instead adjusting
array sizes as new species are added.
2013-10-04 16:22:35 +00:00
Ray Speth
ee9b153efb Improve performance of reading species info from XML
Avoid an O(N) lookup for the thermo info for each species. Using an
unordered_map would be even better, but there's no portable way to do that
without Boost.
2013-06-28 21:24:42 +00:00
Ray Speth
d253fc0d63 Eliminate redundant standard library includes 2013-06-05 17:08:13 +00:00
Ray Speth
255896715c Allow RedlichKwongMFTP objects to be constructed by newThermoPhase 2013-04-12 23:05:59 +00:00
Ray Speth
50617105b5 Removed inaccurately-named atofCheck in favor of fpValueCheck 2013-04-03 23:10:35 +00:00
Ray Speth
01b57ba821 Cleaned up Doxygen documentation for thermo factory classes 2013-03-07 18:51:04 +00:00
Ray Speth
e04e59cdd3 Removed extraneous parentheses around arguments to 'return'
'return' is a keyword, not a function, so these parens are unnecessary.
2013-02-14 01:03:48 +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
ea25de7fe7 Continuing transfering LiquidTransport changes, doing bugfixes, and
qualifying against our testsuite.
2012-12-15 00:49:14 +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
b860262fae Removed constructPhaseFile and constructPhaseXML methods from IonsFromNeutralVPSSTP 2012-08-08 22:16:16 +00:00