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

Some trivial cleaning

Browse Source
This commit is contained in:
Tor Harald Sandve 2017-09-21 12:16:46 +02:00
parent 992ab84435
commit 5839962e31
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/StandardWell.hpp
View File

@ -159,7 +159,6 @@ namespace Opm
using Base::getAllowCrossFlow; using Base::getAllowCrossFlow;
using Base::phaseUsage; using Base::phaseUsage;
using Base::active; using Base::active;
using Base::flowToEbosPvIdx;
using Base::flowPhaseToEbosPhaseIdx; using Base::flowPhaseToEbosPhaseIdx;
using Base::flowPhaseToEbosCompIdx; using Base::flowPhaseToEbosCompIdx;
using Base::numComponents; using Base::numComponents;

2
opm/autodiff/StandardWell_impl.hpp
View File

@ -2045,7 +2045,7 @@ namespace Opm
if (has_solvent && phaseIdx == contiSolventEqIdx ) if (has_solvent && phaseIdx == contiSolventEqIdx )
return 0.01; return 0.01;
// we should come this fare // we should not come this far
assert(false); assert(false);
return 1.0; return 1.0;
} }

2
opm/autodiff/WellInterface.hpp
View File

@ -268,8 +268,6 @@ namespace Opm
int flowPhaseToEbosCompIdx( const int phaseIdx ) const; int flowPhaseToEbosCompIdx( const int phaseIdx ) const;
int flowToEbosPvIdx( const int flowPv ) const;
int flowPhaseToEbosPhaseIdx( const int phaseIdx ) const; int flowPhaseToEbosPhaseIdx( const int phaseIdx ) const;
// TODO: it is dumplicated with StandardWellsDense // TODO: it is dumplicated with StandardWellsDense

9
opm/autodiff/WellInterface_impl.hpp
View File

@ -245,12 +245,15 @@ namespace Opm
flowPhaseToEbosPhaseIdx( const int phaseIdx ) const flowPhaseToEbosPhaseIdx( const int phaseIdx ) const
{ {
const auto& pu = phaseUsage(); const auto& pu = phaseUsage();
if (active()[Water] && pu.phase_pos[Water] == phaseIdx) if (active()[Water] && pu.phase_pos[Water] == phaseIdx) {
return FluidSystem::waterPhaseIdx; return FluidSystem::waterPhaseIdx;
if (active()[Oil] && pu.phase_pos[Oil] == phaseIdx) }
if (active()[Oil] && pu.phase_pos[Oil] == phaseIdx) {
return FluidSystem::oilPhaseIdx; return FluidSystem::oilPhaseIdx;
if (active()[Gas] && pu.phase_pos[Gas] == phaseIdx) }
if (active()[Gas] && pu.phase_pos[Gas] == phaseIdx) {
return FluidSystem::gasPhaseIdx; return FluidSystem::gasPhaseIdx;
}
assert(phaseIdx < 3); assert(phaseIdx < 3);
// for other phases return the index // for other phases return the index