Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix watertransport #558

Merged
merged 7 commits into from
Sep 8, 2018
Merged

Fix watertransport #558

merged 7 commits into from
Sep 8, 2018

Conversation

speth
Copy link
Member

@speth speth commented Aug 30, 2018

Fixes #289

Changes proposed in this pull request:

  • Add the WaterSSTP and WaterTransport classes to their respective factory classes
  • Condense implementation of viscosity and thermalConductivity methods in the water transport class
  • Some cleanup of the test suite
  • Add water transport properties to the object returned by the Water() function in the Python module

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.
@codecov
Copy link

codecov bot commented Aug 30, 2018

Codecov Report

Merging #558 into master will decrease coverage by 0.02%.
The diff coverage is 94.39%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
src/thermo/WaterProps.cpp 67.85% <ø> (-9.63%) ⬇️
include/cantera/transport/WaterTransport.h 33.33% <ø> (+33.33%) ⬆️
include/cantera/thermo/WaterSSTP.h 100% <ø> (ø) ⬆️
...st_problems/cathermo/testWaterTP/testWaterSSTP.cpp 97.75% <100%> (ø) ⬆️
src/transport/TransportFactory.cpp 45.73% <100%> (+0.16%) ⬆️
test/transport/transportModels.cpp 100% <100%> (ø)
src/thermo/ThermoFactory.cpp 76.63% <100%> (+0.1%) ⬆️
src/transport/WaterTransport.cpp 92.59% <92.5%> (+36.07%) ⬆️
src/thermo/WaterSSTP.cpp 75.54% <0%> (-2.72%) ⬇️
src/thermo/WaterPropsIAPWS.cpp 38.16% <0%> (-0.3%) ⬇️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef40d44...97b0b2b. Read the comment docs.

@speth speth merged commit b0b66d7 into Cantera:master Sep 8, 2018
@speth speth deleted the fix-watertransport branch September 12, 2018 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant