using the solvent related from BlackOilFluidState#6939
using the solvent related from BlackOilFluidState#6939GitPaean wants to merge 1 commit intoOPM:masterfrom
Conversation
GitPaean
added
the
manual:irrelevant
There was a problem hiding this comment.
Pull request overview
This PR aligns opm-simulators with opm-common/opm-common#5064 by threading the solvent enable-flag into BlackOilFluidState instantiations and starting to store solvent-related state (e.g., solvent saturation, rsSolw, solvent PVT props) directly on the fluid state rather than as separate members in the solvent module.
Changes:
- Add
EnableSolventas a template argument toBlackOilFluidStatetypedefs across wells/flow/aquifer/experimental paths. - Refactor
BlackOilSolventIntensiveQuantitiesto set/get solvent saturation, rsSolw, solvent invB, and solvent density viafluidState_. - Adjust a few call sites to avoid binding references to values returned from the updated solvent accessors.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| opm/simulators/wells/WellInterface.hpp | Include has_solvent in the BlackOilFluidState alias used by wells. |
| opm/simulators/flow/TemperatureModel.hpp | Include enableSolvent in the temperature-model BlackOilFluidState alias. |
| opm/simulators/flow/EquilInitializer.hpp | Include enableSolvent in EQUIL initialization fluid state type. |
| opm/simulators/aquifers/AquiferAnalytical.hpp | Include enableSolvent in aquifer analytical fluid state type. |
| opm/models/blackoil/blackoilsolventmodules.hh | Move solvent-related storage/access to fluidState_; update solvent PVT handling accordingly. |
| opm/models/blackoil/blackoilintensivequantities.hh | Thread enableSolvent into main intensive-quantities fluid state typedefs. |
| flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp | Thread enableSolvent into experimental/global-index fluid state typedef. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
GitPaean
force-pushed
the
adding_solvent_blackoilfluidstate
branch
from
29f8d96 to
eefaf1e
Compare
totto82
left a comment
totto82
left a comment
There was a problem hiding this comment.
I notice we don't have any regression tests for the CO2SOL option. Maybe we should one before we merge this? Or we can merge this first and add it later. I can make a PR with it asap.
It will be fine after, since we do not have a master reference anyway. The only reason to do it before merging this is to make sure it is running through fine. Sure. We can also get the test case in first. |
GitPaean
force-pushed
the
adding_solvent_blackoilfluidstate
branch
from
eefaf1e to
c60c265
Compare
PR OPM/opm-simulators#6939 Reason: PR OPM/opm-common#5064 PR OPM/opm-simulators#6939 opm-common = 53392fd5950a64837e2c077ecbc44e0e6e5b1d94 opm-grid = 29485c1370945fe39db3862ee4917a3bb3784449 opm-simulators = 0d8ee61f0f2a6b52001cae04843136b3a3e39449 ### Changed Tests ### * spe5
following OPM/opm-common#5064 to move the solvent related from the solventmodule to fluid state.