Merged
Conversation
This makes it possible to create a WaterSSTP phase using an XML input file, and use this model from Python and Matlab.
This allows the elimination of a number of duplicate input files.
This makes it possible to specify the WaterTransport model in XML input files, and to use the model from Python and Matlab. Resolves Cantera#289
Calculating viscosity and thermal conductivity in the WaterProps class was just an unnecessary level of indirection.
The ThermoPhase object used by the WaterTransport model can be any reasonably-accurate equation of state for water.
speth
force-pushed
the
fix-watertransport
branch
from
9b144b7 to
97b0b2b
Compare
Codecov Report
@@ Coverage Diff @@
## master #558 +/- ##
==========================================
- Coverage 64.93% 64.91% -0.03%
==========================================
Files 386 386
Lines 40852 40787 -65
==========================================
- Hits 26527 26475 -52
+ Misses 14325 14312 -13
Continue to review full report at Codecov.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #289
Changes proposed in this pull request:
WaterSSTPandWaterTransportclasses to their respective factory classesviscosityandthermalConductivitymethods in the water transport classWater()function in the Python module