Merge pull request #3428 from akva2/remove_altidx

remove ebos_altidx
OPM · Aug 3, 2021 · ea4cf8d · ea4cf8d
2 parents 43d1298 + 8443306
commit ea4cf8d
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 152 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -515,14 +515,6 @@ else()
   set(EBOS_DEBUG_EXTENSIONS_DEFAULT_ENABLE_IF "TRUE")
 endif()
 
-opm_add_test(ebos_altidx
-  ONLY_COMPILE
-  DEFAULT_ENABLE_IF ${EBOS_DEBUG_EXTENSIONS_DEFAULT_ENABLE_IF}
-  SOURCES ebos/ebos_altidx.cc
-  EXE_NAME ebos_altidx
-  DEPENDS opmsimulators
-  LIBRARIES opmsimulators)
-
 opm_add_test(ebos_plain
   ONLY_COMPILE
   DEFAULT_ENABLE_IF ${EBOS_DEBUG_EXTENSIONS_DEFAULT_ENABLE_IF}

diff --git a/ebos/ebos_altidx.cc b/ebos/ebos_altidx.cc
diff --git a/ebos/eclalternativeblackoilindices.hh b/ebos/eclalternativeblackoilindices.hh
diff --git a/ebos/eclgenericoutputblackoilmodule.cc b/ebos/eclgenericoutputblackoilmodule.cc
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include <ebos/eclgenericoutputblackoilmodule.hh>
-#include <ebos/eclalternativeblackoilindices.hh>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 
@@ -1571,6 +1570,5 @@ updateSummaryRegionValues(const Inplace& inplace,
 }
 
 template class EclGenericOutputBlackoilModule<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,double>;
-template class EclGenericOutputBlackoilModule<BlackOilFluidSystem<double,EclAlternativeBlackOilIndexTraits>,double>;
 
 } // namespace Opm
diff --git a/ebos/eclgenericproblem.cc b/ebos/eclgenericproblem.cc
@@ -24,8 +24,6 @@
 #include <config.h>
 #include <ebos/eclgenericproblem.hh>
 
-#include <ebos/eclalternativeblackoilindices.hh>
-
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -642,16 +640,10 @@ initDRSDT_(size_t numDof,
 template class EclGenericProblem<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
                                  BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,
                                  double>;
-template class EclGenericProblem<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
-                                 BlackOilFluidSystem<double,EclAlternativeBlackOilIndexTraits>,
-                                 double>;
 #else
 template class EclGenericProblem<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
                                  BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,
                                  double>;
-template class EclGenericProblem<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
-                                 BlackOilFluidSystem<double,EclAlternativeBlackOilIndexTraits>,
-                                 double>;
 #endif
 
 template class EclGenericProblem<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,

diff --git a/opm/simulators/wells/MultisegmentWellEval.cpp b/opm/simulators/wells/MultisegmentWellEval.cpp
@@ -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
diff --git a/opm/simulators/wells/StandardWellEval.cpp b/opm/simulators/wells/StandardWellEval.cpp
@@ -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>)
-
 }
diff --git a/opm/simulators/wells/WellInterfaceEval.cpp b/opm/simulators/wells/WellInterfaceEval.cpp
@@ -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
diff --git a/opm/simulators/wells/WellInterfaceFluidSystem.cpp b/opm/simulators/wells/WellInterfaceFluidSystem.cpp
@@ -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
diff --git a/opm/simulators/wells/WellInterfaceIndices.cpp b/opm/simulators/wells/WellInterfaceIndices.cpp
@@ -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