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

feat: Immiscible water model #3236

Merged
merged 77 commits into from
Nov 19, 2024

Conversation

dkachuma
Copy link
Contributor

@dkachuma dkachuma commented Jul 23, 2024

Completes the water on the immiscible water model. This defines a compositional fluid model in which the water component does not participate in the flash but instead makes up it's own 3rd water/aqueous phase which is immiscible with the other 2 phases.

The phase partition is done via ImmiscibleWaterFlash. This removes the water component for the negative two phase flash of the "hydrocarbon" phases and reconstitutes the result into 3 phases.

The water properties (density and viscosity) are by providing reference values at a reference pressure and temperature and providing a compressibility and a thermal expansion coefficient.

Copy link

codecov bot commented Sep 3, 2024

Codecov Report

Attention: Patch coverage is 98.16176% with 5 lines in your changes missing coverage. Please review.

Project coverage is 57.66%. Comparing base (6b07357) to head (f3b6ffc).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
...id/compositional/models/ImmiscibleWaterDensity.hpp 90.47% 2 Missing ⚠️
.../compositional/models/ImmiscibleWaterViscosity.hpp 87.50% 2 Missing ⚠️
...tutive/unitTests/testImmiscibleWaterProperties.cpp 99.11% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3236      +/-   ##
===========================================
+ Coverage    57.51%   57.66%   +0.14%     
===========================================
  Files         1134     1139       +5     
  Lines        97866    98134     +268     
===========================================
+ Hits         56285    56586     +301     
+ Misses       41581    41548      -33     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

@@ -37,12 +37,14 @@ namespace compositional
enum class EquationOfStateType : integer
{
PengRobinson,
SoaveRedlichKwong
SoaveRedlichKwong,
ImmiscibleWater
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i am probably missing something
a bit confused here - how will it know what eos is to use for hc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is specified in the xml. The phases are "lined up" with the EOS e.g.

 <CompositionalThreePhaseFluidLohrenzBrayClark
      name="blackOil"
      phaseNames="{ oil, gas, water }"
      equationsOfState="{ pr, pr, immiscibleWater }" />

However, I think since the immiscibleWater "EOS" is implied in the element name (CompositionalThreePhaseFluidLohrenzBrayClark), there is no need to specify this here. I'm inclined to remove it.

@dkachuma dkachuma added the ci: run code coverage enables running of the code coverage CI jobs label Oct 2, 2024
@paveltomin
Copy link
Contributor

move to merge queue?

Copy link
Contributor

@corbett5 corbett5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests look fine to me.

@paveltomin
Copy link
Contributor

@rrsettgast please review

@dkachuma dkachuma removed the request for review from joshua-white November 11, 2024 18:48
@paveltomin
Copy link
Contributor

Waiting on code owner review from @CusiniM, @jhuang2601, and/or @rrsettgast.

@paveltomin paveltomin removed the ci: run code coverage enables running of the code coverage CI jobs label Nov 15, 2024
Copy link
Collaborator

@CusiniM CusiniM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dkachuma dkachuma added ci: run integrated tests Allows to run the integrated tests in GEOS CI ci: run code coverage enables running of the code coverage CI jobs labels Nov 18, 2024
@paveltomin paveltomin merged commit 6d285d2 into develop Nov 19, 2024
24 of 25 checks passed
@paveltomin paveltomin deleted the feature/dkachuma/immiscible-water-flash branch November 19, 2024 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: run code coverage enables running of the code coverage CI jobs ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI flag: no rebaseline Does not require rebaseline flag: ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants