OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4205 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Bård Skaflestad 2022-10-26 11:48:41 +02:00 committed by GitHub
commit edda5f5c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/flow/python/PyBlackOilSimulator.hpp
View File

@ -59,7 +59,7 @@ private:
const std::string deckFilename_;
bool hasRunInit_ = false;
bool hasRunCleanup_ = false;
bool debug_ = false;
//bool debug_ = false;
// This *must* be declared before other pointers
// to simulator objects. This in order to deinitialize
// MPI at the correct time (ie after the other objects).

14
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -1181,16 +1181,12 @@ namespace Opm
typename WellInterface<TypeTag>::Eval
WellInterface<TypeTag>::getPerfCellPressure(const typename WellInterface<TypeTag>::FluidState& fs) const
{
Eval pressure;
if (Indices::oilEnabled) {
pressure = fs.pressure(FluidSystem::oilPhaseIdx);
if constexpr (Indices::oilEnabled) {
return fs.pressure(FluidSystem::oilPhaseIdx);
} else if constexpr (Indices::waterEnabled) {
return fs.pressure(FluidSystem::waterPhaseIdx);
} else {
if (Indices::waterEnabled) {
pressure = fs.pressure(FluidSystem::waterPhaseIdx);
} else {
pressure = fs.pressure(FluidSystem::gasPhaseIdx);
}
return fs.pressure(FluidSystem::gasPhaseIdx);
}
return pressure;
}
} // namespace Opm