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 #3428 from akva2/remove_altidx

Browse Source 
remove ebos_altidx
This commit is contained in:
Joakim Hove
2021-08-03 14:10:00 +02:00
committed by GitHub
parent 43d129861f 8443306fb6
commit ea4cf8d28f
10 changed files with 0 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/wells/MultisegmentWellEval.cpp
View File

@@ -21,8 +21,6 @@
#include <config.h>
#include <opm/simulators/wells/MultisegmentWellEval.hpp>
#include <ebos/eclalternativeblackoilindices.hh>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/models/blackoil/blackoilindices.hh>
@@ -2011,7 +2009,4 @@ INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,1u,0u,false,false,0u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,1u,false,false,0u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,0u,false,false,1u>)
// Alt indices
INSTANCE(EclAlternativeBlackOilIndexTraits,BlackOilIndices<0u,0u,0u,0u,false,false,0u>)
} // namespace Opm

5
opm/simulators/wells/StandardWellEval.cpp
View File

@@ -22,8 +22,6 @@
#include <config.h>
#include <opm/simulators/wells/StandardWellEval.hpp>
#include <ebos/eclalternativeblackoilindices.hh>
#include <opm/material/densead/DynamicEvaluation.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
@@ -1280,7 +1278,4 @@ INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,1u,0u,false,false,0u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,1u,false,false,0u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,1u,false,false,1u>)
// Alternative indices
INSTANCE(EclAlternativeBlackOilIndexTraits,BlackOilIndices<0u,0u,0u,0u,false,false,0u>)
}

8
opm/simulators/wells/WellInterfaceEval.cpp
View File

@@ -22,8 +22,6 @@
#include <config.h>
#include <opm/simulators/wells/WellInterfaceEval.hpp>
#include <ebos/eclalternativeblackoilindices.hh>
#include <opm/material/densead/Evaluation.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
@@ -535,10 +533,8 @@ calculateBhpFromThp<__VA_ARGS__>(const WellState&, \
DeferredLogger&) const;
using FluidSys = BlackOilFluidSystem<double, BlackOilDefaultIndexTraits>;
using FluidAltSys = BlackOilFluidSystem<double, EclAlternativeBlackOilIndexTraits>;
template class WellInterfaceEval<FluidSys>;
template class WellInterfaceEval<FluidAltSys>;
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation<double,3,0u>)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation<double,4,0u>)
@@ -554,9 +550,6 @@ INSTANCE_METHODS(FluidSys, DenseAd::Evaluation<double,-1,8u>)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation<double,-1,9u>)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation<double,-1,10u>)
INSTANCE_METHODS(FluidAltSys, DenseAd::Evaluation<double,7,0u>)
INSTANCE_METHODS(FluidAltSys, DenseAd::Evaluation<double,-1,8u>)
#define INSTANCE_BHP(...) \
template double WellInterfaceEval<__VA_ARGS__>:: \
calculateBhpFromThp<double>(const WellState&, \
@@ -567,6 +560,5 @@ calculateBhpFromThp<double>(const WellState&, \
DeferredLogger&) const;
INSTANCE_BHP(FluidSys)
INSTANCE_BHP(FluidAltSys)
} // namespace Opm

2
opm/simulators/wells/WellInterfaceFluidSystem.cpp
View File

@@ -34,7 +34,6 @@
#include <opm/simulators/wells/WellState.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <opm/simulators/wells/TargetCalculator.hpp>
#include <ebos/eclalternativeblackoilindices.hh>
#include <cassert>
#include <cmath>
@@ -1102,6 +1101,5 @@ getGroupProductionTargetRate(const Group& group,
return scale;
}
template class WellInterfaceFluidSystem<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>>;
template class WellInterfaceFluidSystem<BlackOilFluidSystem<double,EclAlternativeBlackOilIndexTraits>>;
} // namespace Opm

5
opm/simulators/wells/WellInterfaceIndices.cpp
View File

@@ -22,8 +22,6 @@
#include <config.h>
#include <opm/simulators/wells/WellInterfaceIndices.hpp>
#include <ebos/eclalternativeblackoilindices.hh>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/models/blackoil/blackoilindices.hh>
@@ -143,7 +141,4 @@ INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,1u,false,false,0u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,1u,false,false,1u>)
INSTANCE(BlackOilDefaultIndexTraits,BlackOilIndices<0u,0u,0u,0u,false,false,1u>)
// Alternative indices
INSTANCE(EclAlternativeBlackOilIndexTraits,BlackOilIndices<0u,0u,0u,0u,false,false,0u>)
} // namespace Opm