Commit graph

73 commits

Author SHA1 Message Date
Ray Speth
e669f912a5 Use cppformat in Phase and ThermoPhase 2015-10-14 18:45:22 -04:00
Ray Speth
41527b1ea7 Rename two-argument version of writelog 'debuglog'
This is a prerequisite to allowing writelog to take an arbitrary number
of arguments.
2015-10-14 18:45:22 -04:00
Ray Speth
caf9c6f062 Use cppformat in ThermoPhase::report and overrides 2015-10-14 18:45:22 -04:00
Ray Speth
a956f3904a [Thermo] Deprecate get/setReferenceComposition and xMol_Ref 2015-10-05 15:25:05 -04:00
Ray Speth
86835a5eeb [Thermo] Show large negative species concentrations in phase report
Non-trivial negative concentrations generally indicate a problem, and shouldn't
be hidden.
2015-08-23 19:35:23 -04:00
Ray Speth
bfb20e1f50 Consistently use vector_fp and vector_int typedefs 2015-08-02 23:06:16 -04:00
Ray Speth
ceefc5ecb0 Consistently use ThermoPhase::RT() 2015-08-02 23:06:16 -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
619cd20f14 Fix badly-formatted else/else if/catch clauses 2015-08-02 23:06:15 -04:00
Ray Speth
187fd27cef Remove unnecessary use of (void) 2015-08-02 23:06:14 -04:00
Ray Speth
f1f10b6526 Remove unused, deprecated code marked for removal after Cantera 2.2 2015-07-15 12:08:50 -04:00
Ray Speth
d373e0751e Remove unnecessary explicit specification of namespace Cantera 2015-06-24 14:45:55 -04:00
Bryan W. Weber
5d215b7e86 Add base class functions to set density and pressure simultaneously
They have the names setState_RP, setState_RPX, and setState_RPY. These
base class functions mirror the TP, TPX, TPY set, except that RP is not
implemented, because it depends on the EOS of the system. We cannot use
the normal setPressure because it sets the state by calculating the
density, but RP will specify the density.
2015-06-15 17:46:51 -04:00
Ray Speth
5214672ab3 Merge namespace ctml with namespace Cantera 2015-05-27 18:09:07 -04:00
Ray Speth
a471e4316a [Thermo] Phase::addSpecies takes shared_ptr by value
This helps to clarify that addSpecies stores a copy of the shared_ptr.
2015-04-20 18:34:37 -04:00
Ray Speth
43952b30fc [Thermo] Use shared_ptr<Species> in ThermoPhase 2015-04-14 15:29:28 -04:00
Ray Speth
5195e4f9b8 [Thermo] Use shared_ptr to STIT objects in Species and SpeciesThermo
Exclusive ownership of the SpeciesThermoInterpType objects is no longer assumed.
2015-04-14 15:29:28 -04:00
Ray Speth
a1599ac921 [Thermo] Add 'index' argument to GeneralSpeciesThermo::install_STIT
This is a prerequisite to removing the species index as a property of the
SpeciesThermoInterpType object and making it independent of any specific
ThermoPhase object.
2015-04-14 15:29:28 -04:00
Ray Speth
1dd7b214b5 [Thermo] Deprecate unused method 'getUnitsStandardConc'
First step in resolving Issue #96
2015-04-14 15:18:20 -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
8c934ab678 [Equil] Implement equilibrate as a method of MultiPhase
This differs from the current equilibrate method in that it can use either of
the multiphase equilibrium solvers.
2014-11-08 00:53:42 +00:00
Ray Speth
e16e998dd7 [Equil] Implement equilibrate as a method of ThermoPhase
The Cython interface now calls this equilibrate function.

Unlike the free function 'equilibrate', this new equilibrate method actually
does what the documentation describes regarding the 'solver' argument. This
means that there are cases where failures of the MultiphaseEquil solver were
previously being hidden by a subsequent successful solution using the ChemEquil
solver. These tests have been marked as known failures.
2014-11-08 00:53:39 +00:00
Ray Speth
4dd3e1d2bc Use Species objects when adding species from XML 2014-10-17 23:44:47 +00:00
Ray Speth
5bc4a12e2e Add options for handling Species containing undefined elements 2014-10-17 23:44:37 +00:00
Ray Speth
26b6f190f3 Introduce class Species 2014-10-17 23:44:31 +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
91f3a2b073 Fix statements that called the assignment operator twice 2014-10-03 01:45:41 +00:00
Ray Speth
a8f4c76097 [Thermo] Check to make sure thermo data is installed for all species 2014-09-27 00:08:54 +00:00
Ray Speth
f3fc8f2ce2 [Thermo] Use findXMLPhase in initThermoFile
This allows many constructors which take a filename to work with CTI files
directly, and to make use of the parsed XML cache.
2014-09-26 13:44: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
ea3f74eb27 [Thermo] 'report' only prints species with non-trivial mole fractions
The threshold for printing species is a new, optional parameter to the
'report' function. If any species are excluded, the total number of
minor species and their aggregate mass and mole fraction are printed.
2014-06-03 16:54:15 +00:00
Ray Speth
2a9ab96609 Use NotImplementedError instead of 'err' member functions 2014-05-06 14:39:13 +00:00
Ray Speth
c887c1b6fb Remove unnecessary calls to parseCompString 2014-04-08 19:39:06 +00:00
Ray Speth
14ea7e64c6 [Thermo] make compositonMap a const argument 2014-04-08 16:26:20 +00:00
Ray Speth
4458933420 Fix alignment of ThermoPhase::report output on Windows
Windows uses 3 digits in the exponent, for which there wasn't enough
space being allocated in the columns for the specific properties.
2014-03-13 02:19:19 +00:00
Ray Speth
6a51eb88dc [Thermo] Move modifyOneHf298SS and m_tlast to ThermoPhase
This eliminates many duplicate implementations of this function and
declarations of this variable.
2014-03-08 21:46:58 +00:00
Victor Brunini
d983660c77 Fix ThermoPhase::getElementPotentials and setElementPotentials
Broken in r2719.
2014-03-06 00:40:50 +00:00
Ray Speth
fb2f52b2ec General cleanup of class ThermoPhase 2014-02-06 22:59:07 +00:00
Ray Speth
5dd2f3164a [Thermo] Fix printed labels in phase report when show_thermo=False 2013-12-06 23:15:11 +00:00
Ray Speth
7447c5957d [Thermo] Fix deleting objects that have manually-added species 2013-09-01 00:33:06 +00:00
Ray Speth
0fddd6a129 [Thermo] Fix errors in setState_SPorSV
This corrects the behavior in cases where the correct temperature is below the
nominal minimum temperature for the phase.

Add test cases for this and analogous cases for the maximum temperature and
setState_HPorUV.

Fixes Issue 151.
2013-07-18 19:07:14 +00:00
Ray Speth
61917052d4 Removed unnecessary use of mdp_copy_dbl_1 from ThermoPhase 2013-04-29 18:05:14 +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
6d6e237f07 Removed unnecessary checks surrounding delete operations 2013-02-14 01:03:32 +00:00
Ray Speth
ffd4a7418d Cleaned up Doxygen docs for the Phase and ThermoPhase classes 2013-02-14 01:02:14 +00:00
Harry Moffat
503a12b7aa Added constructors for direct initialization of the IdealGasPhase object.
Moved destructor to .cpp file.
2013-02-11 22:39:22 +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
Victor Brunini
a4ea58f7cc Change ThermoPhase::setStateTPX and setStateTPY functions to call
setStateTP instead of setTemperature and setPressure. Main motivation
is that the IonsFromNeutralVPSSTP child class has setTemperature and
setPressure functions that call setStateTP so this reduces duplicate
work in that case.
2012-12-13 22:16:00 +00:00