Implement Killough Model for capillary hysteresis #2159
Conversation
This file contains 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
4 tasks
# Conflicts: # src/coreComponents/constitutive/CMakeLists.txt # src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp # src/coreComponents/constitutive/capillaryPressure/CapillaryPressureExtrinsicData.hpp # src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp # src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.hpp
…afranc/feat/Killough-PC
# Conflicts: # integratedTests # src/coreComponents/constitutive/CMakeLists.txt # src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp # src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.hpp # src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverRunTest.hpp # src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.hpp # src/coreComponents/physicsSolvers/fluidFlow/IsothermalCompositionalMultiphaseFVMKernelUtilities.hpp # src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.hpp # src/coreComponents/physicsSolvers/fluidFlow/wells/WellFields.hpp # src/coreComponents/schema/docs/TableRelativePermeabilityHysteresis.rst # src/coreComponents/schema/docs/TableRelativePermeabilityHysteresis_other.rst # src/coreComponents/schema/schema.xsd.other # src/coreComponents/unitTests/constitutiveTests/CMakeLists.txt
paveltomin
changed the base branch from
develop
to
jafranc/refactor/relpermHysteresis
|
@jafranc should jafranc/refactor/relpermHysteresis be the base branch for this? can they get synced somehow? i tried to look at the conflicts but i am afraid i won't be able to resolve them |
paveltomin
changed the base branch from
jafranc/refactor/relpermHysteresis
to
develop
paveltomin
changed the base branch from
develop
to
jafranc/refactor/relpermHysteresis
@rrsettgast sorry I can not resolve conflicts myself here |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR aims at implementing Killough[1] model for capillary hysteresis with possible t-reversal option. It comes after #2207 introducing
KilloughHysteresis.These steps will be implemented
TableCapillaryPressureHysteresismirroringTableRelativePermeabilityHysteresis.Same notations as for the implementation of hysteresis for relative permeability are be adopted.
[1] Killough, J. E. "Reservoir simulation with history-dependent saturation functions." Society of Petroleum Engineers Journal 16.01 (1976): 37-48. link
[2] Kleppe, J., et al. "Representation of capillary pressure hysteresis in reservoir simulation." SPE annual technical conference and exhibition. OnePetro, 1997.
Additionally:
TableCapillaryPressureHysteresisTableCapillaryPressureHysteresis