diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bec7a476e6..22924503c2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -486,14 +486,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
deleted file mode 100644
index 5c715791ad2..00000000000
--- a/ebos/ebos_altidx.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*
- This file is part of the Open Porous Media project (OPM).
-
- OPM is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- OPM is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OPM. If not, see .
-
- Consult the COPYING file in the top-level source directory of this
- module for the precise wording of the license and the list of
- copyright holders.
-*/
-/*!
- * \file
- *
- * \brief This is an ebos variant which uses alternative phase and component indices than
- * the default variant.
- *
- * It is purely for testing purposes and is supposed to produce bitwise identical
- * results.
- */
-#include "config.h"
-
-#include "ebos.hh"
-#include "startEbos.hh"
-#include "eclalternativeblackoilindices.hh"
-
-namespace Opm::Properties {
-
-namespace TTag {
-struct EbosAltIdxTypeTag {
- using InheritsFrom = std::tuple;
-};
-}
-
-// use a fluid system with different indices than the default
-template
-struct FluidSystem
-{
- using Scalar = GetPropType;
-
-public:
- typedef BlackOilFluidSystem type;
-};
-
-} // namespace Opm::Properties
-
-int main(int argc, char **argv)
-{
- using ProblemTypeTag = Opm::Properties::TTag::EbosAltIdxTypeTag;
- return Opm::startEbos(argc, argv);
-}
diff --git a/ebos/eclalternativeblackoilindices.hh b/ebos/eclalternativeblackoilindices.hh
deleted file mode 100644
index e2758f36da3..00000000000
--- a/ebos/eclalternativeblackoilindices.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*
- This file is part of the Open Porous Media project (OPM).
-
- OPM is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- OPM is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OPM. If not, see .
-
- Consult the COPYING file in the top-level source directory of this
- module for the precise wording of the license and the list of
- copyright holders.
-*/
-
-#ifndef ECL_ALTERNATIVE_BLACKOIL_INDICES_HH
-#define ECL_ALTERNATIVE_BLACKOIL_INDICES_HH
-
-#include
-
-namespace Opm {
-
-class EclAlternativeBlackOilIndexTraits
-{
- using DIT = Opm::BlackOilDefaultIndexTraits;
-
-public:
- static const unsigned waterPhaseIdx = DIT::oilPhaseIdx;
- static const unsigned oilPhaseIdx = DIT::gasPhaseIdx;
- static const unsigned gasPhaseIdx = DIT::waterPhaseIdx;
-
- static const unsigned waterCompIdx = DIT::gasCompIdx;
- static const unsigned oilCompIdx = DIT::waterCompIdx;
- static const unsigned gasCompIdx = DIT::oilCompIdx;
-};
-
-}
-
-#endif
diff --git a/ebos/eclgenericoutputblackoilmodule.cc b/ebos/eclgenericoutputblackoilmodule.cc
index 05daf6220b0..be487bf0090 100644
--- a/ebos/eclgenericoutputblackoilmodule.cc
+++ b/ebos/eclgenericoutputblackoilmodule.cc
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
@@ -1641,6 +1640,5 @@ updateSummaryRegionValues(const Inplace& inplace,
}
template class EclGenericOutputBlackoilModule,double>;
-template class EclGenericOutputBlackoilModule,double>;
} // namespace Opm
diff --git a/ebos/eclgenericproblem.cc b/ebos/eclgenericproblem.cc
index b27b078362b..f7986acc01e 100644
--- a/ebos/eclgenericproblem.cc
+++ b/ebos/eclgenericproblem.cc
@@ -24,8 +24,6 @@
#include
#include
-#include
-
#include
#include
@@ -642,16 +640,10 @@ initDRSDT_(size_t numDof,
template class EclGenericProblem>>,
BlackOilFluidSystem,
double>;
-template class EclGenericProblem>>,
- BlackOilFluidSystem,
- double>;
#else
template class EclGenericProblem>,
BlackOilFluidSystem,
double>;
-template class EclGenericProblem>,
- BlackOilFluidSystem,
- double>;
#endif
template class EclGenericProblem>,
diff --git a/opm/simulators/wells/MultisegmentWellEval.cpp b/opm/simulators/wells/MultisegmentWellEval.cpp
index 3155508e919..2e4a9109467 100644
--- a/opm/simulators/wells/MultisegmentWellEval.cpp
+++ b/opm/simulators/wells/MultisegmentWellEval.cpp
@@ -21,8 +21,6 @@
#include
#include
-#include
-
#include
#include
@@ -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
index 0337076a9e7..214bb42fdd1 100644
--- a/opm/simulators/wells/StandardWellEval.cpp
+++ b/opm/simulators/wells/StandardWellEval.cpp
@@ -22,8 +22,6 @@
#include
#include
-#include
-
#include
#include
@@ -1276,7 +1274,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
index 0d43a29b9f8..18014737159 100644
--- a/opm/simulators/wells/WellInterfaceEval.cpp
+++ b/opm/simulators/wells/WellInterfaceEval.cpp
@@ -22,8 +22,6 @@
#include
#include
-#include
-
#include
#include
@@ -535,10 +533,8 @@ calculateBhpFromThp<__VA_ARGS__>(const WellState&, \
DeferredLogger&) const;
using FluidSys = BlackOilFluidSystem;
-using FluidAltSys = BlackOilFluidSystem;
template class WellInterfaceEval;
-template class WellInterfaceEval;
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation)
@@ -554,9 +550,6 @@ INSTANCE_METHODS(FluidSys, DenseAd::Evaluation)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation)
INSTANCE_METHODS(FluidSys, DenseAd::Evaluation)
-INSTANCE_METHODS(FluidAltSys, DenseAd::Evaluation)
-INSTANCE_METHODS(FluidAltSys, DenseAd::Evaluation)
-
#define INSTANCE_BHP(...) \
template double WellInterfaceEval<__VA_ARGS__>:: \
calculateBhpFromThp(const WellState&, \
@@ -567,6 +560,5 @@ calculateBhpFromThp(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
index a41e4a9b1c9..5375d51b7b9 100644
--- a/opm/simulators/wells/WellInterfaceFluidSystem.cpp
+++ b/opm/simulators/wells/WellInterfaceFluidSystem.cpp
@@ -34,7 +34,6 @@
#include
#include
#include
-#include
#include
#include
@@ -1102,6 +1101,5 @@ getGroupProductionTargetRate(const Group& group,
return scale;
}
template class WellInterfaceFluidSystem>;
-template class WellInterfaceFluidSystem>;
} // namespace Opm
diff --git a/opm/simulators/wells/WellInterfaceIndices.cpp b/opm/simulators/wells/WellInterfaceIndices.cpp
index 7c1fc558ffc..852e5979872 100644
--- a/opm/simulators/wells/WellInterfaceIndices.cpp
+++ b/opm/simulators/wells/WellInterfaceIndices.cpp
@@ -22,8 +22,6 @@
#include
#include
-#include
-
#include
#include
@@ -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