OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fluid systems: rename unexpressive phase and component indices

Browse Source 
These index names have been fully fluid system dependent for a while
and are supposed to be just used for convenience. This means that
phase names are now actual camelCase words.
This commit is contained in:
Andreas Lauser
2014-04-03 16:34:23 +02:00
parent 96b3d753e2
commit c0a7947357
27 changed files with 617 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_fluidmatrixinteractions.cpp
View File

@@ -158,8 +158,8 @@ void testTwoPhaseApi()
"This material law is expected to implement "
"the two-phase API!");
OPM_UNUSED static const int wPhaseIdx = MaterialLaw::wPhaseIdx;
OPM_UNUSED static const int nPhaseIdx = MaterialLaw::nPhaseIdx;
OPM_UNUSED static const int wettingPhaseIdx = MaterialLaw::wettingPhaseIdx;
OPM_UNUSED static const int nonWettingPhaseIdx = MaterialLaw::nonWettingPhaseIdx;
// make sure the two-phase specific methods are present
const FluidState fs;
@@ -219,9 +219,9 @@ void testThreePhaseApi()
"The number of fluid phases for a threephase "
"capillary pressure law must be 3");
OPM_UNUSED static const int wPhaseIdx = MaterialLaw::wPhaseIdx;
OPM_UNUSED static const int nPhaseIdx = MaterialLaw::nPhaseIdx;
OPM_UNUSED static const int gPhaseIdx = MaterialLaw::gPhaseIdx;
OPM_UNUSED static const int wettingPhaseIdx = MaterialLaw::wettingPhaseIdx;
OPM_UNUSED static const int nonWettingPhaseIdx = MaterialLaw::nonWettingPhaseIdx;
OPM_UNUSED static const int gasPhaseIdx = MaterialLaw::gasPhaseIdx;
// make sure the two-phase specific methods are present
const FluidState fs;
@@ -256,13 +256,13 @@ int main(int argc, char **argv)
typedef Opm::FluidSystems::BlackOil<Scalar> ThreePFluidSystem;
typedef Opm::TwoPhaseMaterialTraits<Scalar,
TwoPFluidSystem::wPhaseIdx,
TwoPFluidSystem::nPhaseIdx> TwoPhaseTraits;
TwoPFluidSystem::wettingPhaseIdx,
TwoPFluidSystem::nonWettingPhaseIdx> TwoPhaseTraits;
typedef Opm::ThreePhaseMaterialTraits<Scalar,
ThreePFluidSystem::wPhaseIdx,
ThreePFluidSystem::oPhaseIdx,
ThreePFluidSystem::gPhaseIdx> ThreePhaseTraits;
ThreePFluidSystem::waterPhaseIdx,
ThreePFluidSystem::oilPhaseIdx,
ThreePFluidSystem::gasPhaseIdx> ThreePhaseTraits;
typedef Opm::ImmiscibleFluidState<Scalar, TwoPFluidSystem> TwoPhaseFluidState;
typedef Opm::ImmiscibleFluidState<Scalar, ThreePFluidSystem> ThreePhaseFluidState;