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

OutputBlackoilModule: add a container for the FIP data #5939

Merged
merged 15 commits into from
Feb 3, 2025
Merged

OutputBlackoilModule: add a container for the FIP data #5939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
50f3d7d
add a FIPContainer class
akva2 Jan 31, 2025
efbda68
move assignment of Co2InGas fip values into FIPContainer
akva2 Jan 31, 2025
63042c2
OutputBlackoilModule: move gas-water fip assignment code to FIPContainer
akva2 Jan 30, 2025
3ffd659
OutputBlackoilModule: move updateInplaceVolumesSurface to FIPContainer
akva2 Jan 30, 2025
be86ef1
OutputBlackoilModule: move updateInplaceVolumesReservoir to FIPContainer
akva2 Jan 30, 2025
58c1a16
move assignment of OilGasDistribution fip values into FIPContainer
akva2 Jan 31, 2025
9cc5f11
move assignment of Co2InWater fip values into FIPContainer
akva2 Jan 31, 2025
9ae656f
move assignment of porevolume fip values into FIPContainer
akva2 Jan 31, 2025
57ef2b6
move output of restart FIP values into FIPContainer
akva2 Jan 31, 2025
f816995
FIPContainer: add query function for phase presence
akva2 Jan 31, 2025
d79e0fd
FIPContainer: add helper to check if there are Co2InGas entries
akva2 Jan 31, 2025
51efe81
FIPContainer: add helper to check if there are Co2InWater entries
akva2 Jan 31, 2025
651ecf7
FIPContainer: add accessor for phase vectors
akva2 Jan 31, 2025
e78ce63
FIPContainer: take ownership of map
akva2 Jan 31, 2025
01a5641
FIPContainer: change to using has()
akva2 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/ConvergenceOutputConfiguration.cpp
opm/simulators/flow/EclGenericWriter.cpp
opm/simulators/flow/ExtraConvergenceOutputThread.cpp
opm/simulators/flow/FIPContainer.cpp
opm/simulators/flow/FlowGenericProblem.cpp
opm/simulators/flow/FlowGenericVanguard.cpp
opm/simulators/flow/FlowProblemParameters.cpp
Expand Down Expand Up @@ -816,6 +817,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FemCpGridCompat.hpp
opm/simulators/flow/FIBlackoilModel.hpp
opm/simulators/flow/FIPContainer.hpp
opm/simulators/flow/FlowBaseProblemProperties.hpp
opm/simulators/flow/FlowBaseVanguard.hpp
opm/simulators/flow/FlowGenericProblem.hpp
Expand Down
Loading