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.

Sign up for GitHub

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

Jump to bottom

Factoring hysteresis model out of TableRelativePermeabilityHysteresis #2207

Open
wants to merge 51 commits into
base: develop
Choose a base branch
from
Open

Factoring hysteresis model out of TableRelativePermeabilityHysteresis #2207

wants to merge 51 commits into from

Conversation

jafranc
Copy link
Contributor

@jafranc jafranc commented Dec 9, 2022 •
edited by francoishamon
Loading

Refactor TableRelativePermeabilityHysteresis in preparation for #2159.
A KilloughHysteresis class will be created taking responsabilities for:

  • compute portion of trapped phase
  • store and provide access to Killough model parameters (jerauld coeff, curvature coeff, reversal buffers)
  • define HystersisCurve type storing major point of Hysteresis curve in a fashion of {sat,value} pair for all three points.

The KilloughHysteresis could also be responsible for computing Land Coefficient and all imbibition values as it is specific to the model how to compute these intermediate scanning curves. It can also be specialized further down to have a KilloughHysteresisRelativePermeability and KilloughHysteresisCapillaryPressure.

Eventually if new model improving capillary pressure treatment ( e.g Kleppe model [2]), it can be turn into a more templatized design.

Additionally,

  • revise unitTest for TableRelativePermeabilityHysteresis

Rebaseline done in GEOS-DEV/integratedTests#24

jafranc and others added 20 commits November 10, 2022 16:40
@jafranc
save commit before refactoring
87d210e
@jafranc
factor out Killough Parameters to be used by TableHysteresis
4e937e1
@jafranc
Adding TableCapillaryPressureHysteresis class
81a85cc
@jafranc
adding phaseVolTrapped to CapillaryBase + inheritance
162b899
@jafranc
adding Hysteresis capillary table
b4456bf
few correction/missing parts
fa48972
uncrustify + some corrections
35988c4
addding save converged state for capillary model
4e4956c
adding headers and minor fixes
67a3cf7
adding a test for capillary hysteresis
505d475
adapt test for hyst relperm
3da2cd5
uncrustify
a016798
uncrustified + bounded F ratio
c4c592e
added a Logic error
6701749
add flags logic and correct 2phase
21f6a3b
flags as cell-wise fields
3da4473
adding a test case
f766c68
clean capillaryPCHyst + fix few filename convention
63a086b
init KilloughHysteresis obj through relpermClass + usage of 3-points …
cc01813 
…curves instead of tables
start revising unitest
c5ae8cd
@jafranc jafranc mentioned this pull request Dec 9, 2022
Draft
4 tasks
jafranc and others added 4 commits December 10, 2022 04:26
@jafranc
cleaning up interfaces
53e89f5
Merge branch 'develop' into jafranc/refactor/relpermHysteresis
ea74141 
# Conflicts:
#	src/coreComponents/constitutive/CMakeLists.txt
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureExtrinsicData.hpp
#	src/coreComponents/constitutive/relativePermeability/RelativePermeabilityExtrinsicData.hpp
#	src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp
#	src/coreComponents/constitutive/thermalConductivity/MultiPhaseThermalConductivityFields.hpp
#	src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityFields.hpp
#	src/coreComponents/constitutive/thermalConductivity/ThermalConductivityFields.hpp
#	src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
clean up post-merge
7ce9a1b
fix trapped fraction
1b60f12
@jafranc jafranc changed the title Jafranc/refactor/relperm hysteresis Factoring hysteris model out of TableRelativePermeabilityHysteresis Dec 13, 2022
francoishamon
francoishamon approved these changes Jul 10, 2023
View reviewed changes
Copy link
Contributor

@francoishamon francoishamon left a comment

Choose a reason for hiding this comment

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

Looks very good, passes integrated tests, thanks @jafranc

@francoishamon francoishamon added type: cleanup / refactor Non-functional change (NFC) flag: ready for review flag: requires rebaseline Requires rebaseline branch in integratedTests labels Jul 10, 2023
@francoishamon francoishamon mentioned this pull request Jul 21, 2023
Open
@paveltomin
Copy link
Contributor

@jafranc clean up and move into the merge queue?

@jafranc
Copy link
Contributor Author

jafranc commented Oct 12, 2023

We face some GPU issue IIRC, let us fix that soon

@paveltomin
Copy link
Contributor

We face some GPU issue IIRC, let us fix that soon

any update?

@paveltomin paveltomin added ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI and removed flag: ready for review labels Dec 14, 2023
@paveltomin paveltomin force-pushed the jafranc/refactor/relpermHysteresis branch from b9e1ae5 to fdbfbd1 Compare December 14, 2023 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@francoishamon francoishamon francoishamon approved these changes

At least 1 approving review is required to merge this pull request.

Assignees

@jafranc jafranc

Labels
ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI flag: requires rebaseline Requires rebaseline branch in integratedTests type: cleanup / refactor Non-functional change (NFC)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jafranc @paveltomin @francoishamon