-
Notifications
You must be signed in to change notification settings - Fork 123
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
Compositional simulator expanded to three phases #5851
base: master
Are you sure you want to change the base?
Conversation
4a79ef0
to
4a0b8ab
Compare
4a0b8ab
to
253e5c2
Compare
b6ea038
to
41b232d
Compare
Sorry for the delay. But I will review the PR now. Due to the change in master branch, there is some update needed in |
Note: compositional is now always three phase!
Choice of simulator is based on if WATER is present in RUNSPEC.
41b232d
to
20ca154
Compare
I've pushed a new update with changes in the mentioned file. |
opm/simulators/flow/FIPContainer.cpp
Outdated
INSTANTIATE_COMP_TWOPHASE(4) | ||
INSTANTIATE_COMP_TWOPHASE(5) | ||
INSTANTIATE_COMP_TWOPHASE(6) | ||
INSTANTIATE_COMP_TWOPHASE(7) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make a new macro
#define INSTANTIATE_COMP(NUM) \
INSTANTIATE_COMP_THREEPHASE(NUM) \
INSTANTIATE_COMP_TWOPHASE(NUM)
less duped lines, easier maintenance (you can still call the threephase one for 0).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
So /= sumS; | ||
Sg /= sumS; | ||
Sw /= sumS; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just leaving some notes for later,
should we update the water saturation in the fluidState_ again here?
I is very well done job. I went through without noticing anything significant. We will wait to check against some reference output. It is possible there will be some minor comments here and there. I will invite @akva2 to have a look for the part that he is interested, since he has some quite some overview related FluidSystem. |
Added a "dummy"/immiscible water phase to the compositional simulator using the three-phase fluid system in OPM/opm-common#4410. An additional equation for the water phase has been added with water saturation as primary variable. Water phase properties are set using standard keywords as in black oil simulations.