Merge pull request #5245 from akva2/ebos_drop_full

Drop ebos: Mega PR

CMakeLists.txt

@@ -614,7 +614,7 @@ set(FLOW_VARIANT_MODELS brine_energy onephase onephase_energy)
 
 set(FLOW_TGTS)
 foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS} ${FLOW_VARIANT_MODELS})
-  add_library(flow_lib${OBJ} OBJECT flow/flow_ebos_${OBJ}.cpp)
+  add_library(flow_lib${OBJ} OBJECT flow/flow_${OBJ}.cpp)
   list(APPEND FLOW_TGTS $<TARGET_OBJECTS:flow_lib${OBJ}>)
   if(TARGET fmt::fmt)
     target_link_libraries(flow_lib${OBJ} fmt::fmt)

CMakeLists_files.cmake

@@ -23,17 +23,6 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  ebos/eclgenericcpgridvanguard.cc
-  ebos/eclgenericproblem.cc
-  ebos/eclgenericthresholdpressure.cc
-  ebos/eclgenerictracermodel.cc
-  ebos/eclgenericvanguard.cc
-  ebos/eclgenericwriter.cc
-  ebos/eclmixingratecontrols.cc
-  ebos/eclsolutioncontainers.cc
-  ebos/ecltransmissibility.cc
-  ebos/equil/equilibrationhelpers.cc
-  ebos/equil/initstateequil.cc
   opm/core/props/BlackoilPhases.cpp
   opm/core/props/phaseUsageFromDeck.cpp
   opm/core/props/satfunc/RelpermDiagnostics.cpp
@@ -42,20 +31,31 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/Banners.cpp
   opm/simulators/flow/CollectDataOnIORank.cpp
   opm/simulators/flow/ConvergenceOutputConfiguration.cpp
+  opm/simulators/flow/EclGenericWriter.cpp
   opm/simulators/flow/ExtraConvergenceOutputThread.cpp
+  opm/simulators/flow/FlowGenericProblem.cpp
+  opm/simulators/flow/FlowGenericVanguard.cpp
   opm/simulators/flow/FlowUtils.cpp
+  opm/simulators/flow/GenericCpGridVanguard.cpp
   opm/simulators/flow/GenericOutputBlackoilModule.cpp
+  opm/simulators/flow/GenericThresholdPressure.cpp
+  opm/simulators/flow/GenericTracerModel.cpp
   opm/simulators/flow/InterRegFlows.cpp
   opm/simulators/flow/KeywordValidation.cpp
   opm/simulators/flow/LogOutputHelper.cpp
   opm/simulators/flow/Main.cpp
+  opm/simulators/flow/MixingRateControls.cpp
   opm/simulators/flow/NonlinearSolver.cpp
   opm/simulators/flow/partitionCells.cpp
   opm/simulators/flow/RSTConv.cpp
   opm/simulators/flow/RegionPhasePVAverage.cpp
   opm/simulators/flow/SimulatorReportBanners.cpp
   opm/simulators/flow/SimulatorSerializer.cpp
+  opm/simulators/flow/SolutionContainers.cpp
+  opm/simulators/flow/Transmissibility.cpp
   opm/simulators/flow/ValidationFunctions.cpp
+  opm/simulators/flow/equil/EquilibrationHelpers.cpp
+  opm/simulators/flow/equil/InitStateEquil.cpp
   opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
   opm/simulators/linalg/FlexibleSolver1.cpp
   opm/simulators/linalg/FlexibleSolver2.cpp
@@ -152,12 +152,13 @@ list (APPEND MAIN_SOURCE_FILES
 
 
 if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
-  list (APPEND MAIN_SOURCE_FILES opm/simulators/utils/DamarisOutputModule.cpp
-                                 opm/simulators/utils/DamarisKeywords.cpp
-                                 opm/simulators/utils/initDamarisXmlFile.cpp
-                                 ebos/damariswriter.cc
-                                 opm/simulators/utils/DamarisVar.cpp
-                                 opm/simulators/utils/GridDataOutput.cpp
+  list (APPEND MAIN_SOURCE_FILES
+    opm/simulators/flow/DamarisWriter.cpp
+    opm/simulators/utils/DamarisKeywords.cpp
+    opm/simulators/utils/DamarisOutputModule.cpp
+    opm/simulators/utils/DamarisVar.cpp
+    opm/simulators/utils/GridDataOutput.cpp
+    opm/simulators/utils/initDamarisXmlFile.cpp
   )
 endif()
 if(CUDA_FOUND)
@@ -267,7 +268,7 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_convergencereport.cpp
   tests/test_deferredlogger.cpp
   tests/test_dilu.cpp
-  tests/test_equil.cc
+  tests/test_equil.cpp
   tests/test_extractMatrix.cpp
   tests/test_flexiblesolver.cpp
   tests/test_glift1.cpp
@@ -409,34 +410,6 @@ list (APPEND TEST_DATA_FILES
 # originally generated with the command:
 # find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
 list (APPEND PUBLIC_HEADER_FILES
-  ebos/ebos.hh
-  ebos/eclbasevanguard.hh
-  ebos/eclcpgridvanguard.hh
-  ebos/eclequilinitializer.hh
-  ebos/eclfluxmodule.hh
-  ebos/eclgenericcpgridvanguard.hh
-  ebos/eclgenericproblem.hh
-  ebos/eclgenericproblem_impl.hh
-  ebos/eclgenericthresholdpressure.hh
-  ebos/eclgenericthresholdpressure_impl.hh
-  ebos/eclgenerictracermodel.hh
-  ebos/eclgenerictracermodel_impl.hh
-  ebos/eclgenericvanguard.hh
-  ebos/eclgenericwriter.hh
-  ebos/eclgenericwriter_impl.hh
-  ebos/eclmixingratecontrols.hh
-  ebos/eclnewtonmethod.hh
-  ebos/eclpolyhedralgridvanguard.hh
-  ebos/eclproblem.hh
-  ebos/eclproblem_properties.hh
-  ebos/eclsolutioncontainers.hh
-  ebos/eclthresholdpressure.hh
-  ebos/ecltracermodel.hh
-  ebos/ecltransmissibility.hh
-  ebos/ecltransmissibility_impl.hh
-  ebos/eclwriter.hh
-  ebos/femcpgridcompat.hh
-  ebos/vtkecltracermodule.hh
   opm/simulators/flow/ActionHandler.hpp
   opm/simulators/flow/AluGridCartesianIndexMapper.hpp
   opm/simulators/flow/AluGridVanguard.hpp
@@ -449,27 +422,58 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/CollectDataOnIORank_impl.hpp
   opm/simulators/flow/ConvergenceOutputConfiguration.hpp
   opm/simulators/flow/countGlobalCells.hpp
+  opm/simulators/flow/CpGridVanguard.hpp
   opm/simulators/flow/DummyGradientCalculator.hpp
+  opm/simulators/flow/EclGenericWriter.hpp
+  opm/simulators/flow/EclGenericWriter_impl.hpp
+  opm/simulators/flow/EclWriter.hpp
+  opm/simulators/flow/EquilInitializer.hpp
   opm/simulators/flow/ExtraConvergenceOutputThread.hpp
+  opm/simulators/flow/FemCpGridCompat.hpp
+  opm/simulators/flow/FIBlackoilModel.hpp
+  opm/simulators/flow/FlowBaseVanguard.hpp
+  opm/simulators/flow/FlowGenericProblem.hpp
+  opm/simulators/flow/FlowGenericProblem_impl.hpp
+  opm/simulators/flow/FlowGenericVanguard.hpp
   opm/simulators/flow/FlowMain.hpp
+  opm/simulators/flow/FlowProblem.hpp
+  opm/simulators/flow/FlowProblemProperties.hpp
   opm/simulators/flow/FlowUtils.hpp
   opm/simulators/flow/FlowsData.hpp
+  opm/simulators/flow/FlowThresholdPressure.hpp
+  opm/simulators/flow/GenericCpGridVanguard.hpp
   opm/simulators/flow/GenericOutputBlackoilModule.hpp
+  opm/simulators/flow/GenericThresholdPressure.hpp
+  opm/simulators/flow/GenericThresholdPressure_impl.hpp
+  opm/simulators/flow/GenericTracerModel.hpp
+  opm/simulators/flow/GenericTracerModel_impl.hpp
   opm/simulators/flow/InterRegFlows.hpp
   opm/simulators/flow/KeywordValidation.hpp
   opm/simulators/flow/LogOutputHelper.hpp
   opm/simulators/flow/Main.hpp
+  opm/simulators/flow/MixingRateControls.hpp
+  opm/simulators/flow/NewTranFluxModule.hpp
   opm/simulators/flow/NonlinearSolver.hpp
   opm/simulators/flow/OutputBlackoilModule.hpp
   opm/simulators/flow/partitionCells.hpp
+  opm/simulators/flow/PolyhedralGridVanguard.hpp
   opm/simulators/flow/priVarsPacking.hpp
   opm/simulators/flow/RSTConv.hpp
   opm/simulators/flow/RegionPhasePVAverage.hpp
   opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
   opm/simulators/flow/SimulatorReportBanners.hpp
   opm/simulators/flow/SimulatorSerializer.hpp
+  opm/simulators/flow/SolutionContainers.hpp
   opm/simulators/flow/SubDomain.hpp
+  opm/simulators/flow/TracerModel.hpp
+  opm/simulators/flow/Transmissibility.hpp
+  opm/simulators/flow/Transmissibility_impl.hpp
   opm/simulators/flow/ValidationFunctions.hpp
+  opm/simulators/flow/VtkTracerModule.hpp
+  opm/simulators/flow/equil/EquilibrationHelpers.hpp
+  opm/simulators/flow/equil/EquilibrationHelpers_impl.hpp
+  opm/simulators/flow/equil/InitStateEquil.hpp
+  opm/simulators/flow/equil/InitStateEquil_impl.hpp
   opm/core/props/BlackoilPhases.hpp
   opm/core/props/phaseUsageFromDeck.hpp
   opm/core/props/satfunc/RelpermDiagnostics.hpp
@@ -632,13 +636,14 @@ list (APPEND PUBLIC_HEADER_FILES
   )
 
 if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
-  list (APPEND PUBLIC_HEADER_FILES opm/simulators/utils/DamarisOutputModule.hpp
-                                   opm/simulators/utils/DamarisKeywords.hpp
-                                   ebos/damaris_properties.hh
-                                   ebos/damariswriter.hh
-                                   opm/simulators/utils/DamarisVar.hpp
-                                   opm/simulators/utils/GridDataOutput.hpp
-                                   opm/simulators/utils/GridDataOutput_impl.hpp
+  list (APPEND PUBLIC_HEADER_FILES
+    opm/simulators/utils/DamarisKeywords.hpp
+    opm/simulators/utils/DamarisOutputModule.hpp
+    opm/simulators/flow/DamarisProperties.hpp
+    opm/simulators/flow/DamarisWriter.hpp
+    opm/simulators/utils/DamarisVar.hpp
+    opm/simulators/utils/GridDataOutput.hpp
+    opm/simulators/utils/GridDataOutput_impl.hpp
   )
 endif()
 

ebos/ebos.hh

@@ -1,229 +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 <http://www.gnu.org/licenses/>.
-
-  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 The common settings for all ebos variants.
- */
-#ifndef EBOS_HH
-#define EBOS_HH
-
-#include <ebos/eclproblem.hh>
-
-#include <opm/models/utils/start.hh>
-
-#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
-#include <opm/simulators/linalg/ISTLSolver.hpp>
-#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
-#include <opm/simulators/wells/BlackoilWellModel.hpp>
-
-namespace Opm {
-template <class TypeTag>
-class EbosProblem;
-}
-
-namespace Opm::Properties {
-
-namespace TTag {
-struct EbosTypeTag {
-    using InheritsFrom = std::tuple<FlowModelParameters, EclBaseProblem, BlackOilModel, EclTimeSteppingParameters>;
-};
-}
-
-// Set the problem class
-template<class TypeTag>
-struct Problem<TypeTag, TTag::EbosTypeTag> {
-    using type = EbosProblem<TypeTag>;
-};
-
-// Enable experimental features for ebos: ebos is the research simulator of the OPM
-// project. If you're looking for a more stable "production quality" simulator, consider
-// using `flow`
-template<class TypeTag>
-struct EnableExperiments<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = true;
-};
-
-// use flow's well model for now
-template<class TypeTag>
-struct WellModel<TypeTag, TTag::EbosTypeTag> {
-    using type = BlackoilWellModel<TypeTag>;
-};
-
-// currently, ebos uses the non-multisegment well model by default to avoid
-// regressions. the --use-multisegment-well=true|false command line parameter is still
-// available in ebos, but hidden from view.
-template<class TypeTag>
-struct UseMultisegmentWell<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = false;
-};
-
-// set some properties that are only required by the well model
-template<class TypeTag>
-struct MatrixAddWellContributions<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = true;
-};
-
-template<class TypeTag>
-struct EnableTerminalOutput<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = false;
-};
-
-// flow's well model only works with surface volumes
-template<class TypeTag>
-struct BlackoilConserveSurfaceVolume<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = true;
-};
-
-// the values for the residual are for the whole cell instead of for a cubic meter of the cell
-template<class TypeTag>
-struct UseVolumetricResidual<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = false;
-};
-
-// by default use flow's aquifer model for now
-template<class TypeTag>
-struct AquiferModel<TypeTag, TTag::EbosTypeTag> {
-    using type = BlackoilAquiferModel<TypeTag>;
-};
-
-// use flow's linear solver backend for now
-template<class TypeTag>
-struct LinearSolverSplice<TypeTag, TTag::EbosTypeTag> {
-    using type = TTag::FlowIstlSolver;
-};
-
-template<>
-struct LinearSolverBackend<TTag::EbosTypeTag, TTag::FlowIstlSolverParams> {
-    using type = ISTLSolver<TTag::EbosTypeTag>;
-};
-
-// the default for the allowed volumetric error for oil per second
-template<class TypeTag>
-struct NewtonTolerance<TypeTag, TTag::EbosTypeTag> {
-    using type = GetPropType<TypeTag, Scalar>;
-    static constexpr type value = 1e-1;
-};
-
-// set fraction of the pore volume where the volumetric residual may be violated during
-// strict Newton iterations
-template<class TypeTag>
-struct EclNewtonRelaxedVolumeFraction<TypeTag, TTag::EbosTypeTag> {
-    using type = GetPropType<TypeTag, Scalar>;
-    static constexpr type value = 0.05;
-};
-
-// the maximum volumetric error of a cell in the relaxed region
-template<class TypeTag>
-struct EclNewtonRelaxedTolerance<TypeTag, TTag::EbosTypeTag> {
-    using type = GetPropType<TypeTag, Scalar>;
-    static constexpr type value = 1e6*getPropValue<TypeTag, Properties::NewtonTolerance>();
-};
-
-// the tolerated amount of "incorrect" amount of oil per time step for the complete
-// reservoir. this is scaled by the pore volume of the reservoir, i.e., larger reservoirs
-// will tolerate larger residuals.
-template<class TypeTag>
-struct EclNewtonSumTolerance<TypeTag, TTag::EbosTypeTag> {
-    using type = GetPropType<TypeTag, Scalar>;
-    static constexpr type value = 1e-5;
-};
-
-// make all Newton iterations strict, i.e., the volumetric Newton tolerance must be
-// always be upheld in the majority of the spatial domain. In this context, "majority"
-// means 1 - EclNewtonRelaxedVolumeFraction.
-template<class TypeTag>
-struct EclNewtonStrictIterations<TypeTag, TTag::EbosTypeTag> {
-    static constexpr int value = 100;
-};
-
-// set the maximum number of Newton iterations to 8 so that we fail quickly (albeit
-// relatively often)
-template<class TypeTag>
-struct NewtonMaxIterations<TypeTag, TTag::EbosTypeTag> {
-    static constexpr int value = 8;
-};
-
-// if openMP is available, set the default the number of threads per process for the main
-// simulation to 2 (instead of grabbing everything that is available).
-#if _OPENMP
-template<class TypeTag>
-struct ThreadsPerProcess<TypeTag, TTag::EbosTypeTag> {
-    static constexpr int value = 2;
-};
-#endif
-
-// By default, ebos accepts the result of the time integration unconditionally if the
-// smallest time step size is reached.
-template<class TypeTag>
-struct ContinueOnConvergenceError<TypeTag, TTag::EbosTypeTag> {
-    static constexpr bool value = true;
-};
-
-} // namespace Opm::Properties
-
-namespace Opm {
-template <class TypeTag>
-class EbosProblem : public EclProblem<TypeTag>
-{
-    typedef EclProblem<TypeTag> ParentType;
-
-public:
-    static void registerParameters()
-    {
-        ParentType::registerParameters();
-
-        BlackoilModelParameters<TypeTag>::registerParameters();
-        EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTerminalOutput, "Do *NOT* use!");
-        EWOMS_HIDE_PARAM(TypeTag, DbhpMaxRel);
-        EWOMS_HIDE_PARAM(TypeTag, DwellFractionMax);
-        EWOMS_HIDE_PARAM(TypeTag, MaxResidualAllowed);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceMb);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceMbRelaxed);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceCnv);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceCnvRelaxed);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceWells);
-        EWOMS_HIDE_PARAM(TypeTag, ToleranceWellControl);
-        EWOMS_HIDE_PARAM(TypeTag, MaxWelleqIter);
-        EWOMS_HIDE_PARAM(TypeTag, UseMultisegmentWell);
-        EWOMS_HIDE_PARAM(TypeTag, TolerancePressureMsWells);
-        EWOMS_HIDE_PARAM(TypeTag, MaxPressureChangeMsWells);
-        EWOMS_HIDE_PARAM(TypeTag, MaxInnerIterMsWells);
-        EWOMS_HIDE_PARAM(TypeTag, MaxNewtonIterationsWithInnerWellIterations);
-        EWOMS_HIDE_PARAM(TypeTag, MaxInnerIterWells);
-        EWOMS_HIDE_PARAM(TypeTag, MaxSinglePrecisionDays);
-        EWOMS_HIDE_PARAM(TypeTag, MinStrictCnvIter);
-        EWOMS_HIDE_PARAM(TypeTag, MinStrictMbIter);
-        EWOMS_HIDE_PARAM(TypeTag, SolveWelleqInitially);
-        EWOMS_HIDE_PARAM(TypeTag, UpdateEquationsScaling);
-        EWOMS_HIDE_PARAM(TypeTag, UseUpdateStabilization);
-        EWOMS_HIDE_PARAM(TypeTag, MatrixAddWellContributions);
-        EWOMS_HIDE_PARAM(TypeTag, EnableTerminalOutput);
-    }
-
-    // inherit the constructors
-    using ParentType::EclProblem;
-};
-}
-
-#endif // EBOS_HH

ebos/eclgenericthresholdpressure.cc

@@ -1,64 +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 <http://www.gnu.org/licenses/>.
-
-  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.
-*/
-
-#include <config.h>
-#include <limits>
-#include <ebos/eclgenericthresholdpressure.hh>
-#include <ebos/eclgenericthresholdpressure_impl.hh>
-
-#include <opm/grid/CpGrid.hpp>
-
-#if HAVE_DUNE_FEM
-#include <dune/fem/gridpart/adaptiveleafgridpart.hh>
-#include <dune/fem/gridpart/common/gridpart2gridview.hh>
-#include <ebos/femcpgridcompat.hh>
-#endif // HAVE_DUNE_FEM
-
-namespace Opm {
-
-template class EclGenericThresholdPressure<Dune::CpGrid,
-                                           Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
-                                           Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
-                                           double>;
-
-#if HAVE_DUNE_FEM
-template class EclGenericThresholdPressure<Dune::CpGrid,
-                                           Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
-                                           Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>,
-                                           double>;
-template class EclGenericThresholdPressure<Dune::CpGrid,
-                                            Dune::Fem::GridPart2GridViewImpl<
-                                                Dune::Fem::AdaptiveLeafGridPart<
-                                                    Dune::CpGrid,
-                                                    Dune::PartitionIteratorType(4),
-                                                    false> >,
-                                            Dune::MultipleCodimMultipleGeomTypeMapper<
-                                                Dune::Fem::GridPart2GridViewImpl<
-                                                    Dune::Fem::AdaptiveLeafGridPart<
-                                                        Dune::CpGrid,
-                                                        Dune::PartitionIteratorType(4),
-                                                        false>>>,
-                                            double>;
-#endif // HAVE_DUNE_FEM
-
-} // namespace Opm

ebos/eclgenerictracermodel.cc

@@ -1,57 +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 <http://www.gnu.org/licenses/>.
-
-  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.
-*/
-#include <config.h>
-#include "eclgenerictracermodel_impl.hh"
-
-#if HAVE_DUNE_FEM
-#include <dune/fem/gridpart/adaptiveleafgridpart.hh>
-#include <dune/fem/gridpart/common/gridpart2gridview.hh>
-#include <ebos/femcpgridcompat.hh>
-#endif // HAVE_DUNE_FEM
-
-namespace Opm {
-
-template class EclGenericTracerModel<Dune::CpGrid,
-                                     Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
-                                     Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
-                                     Opm::EcfvStencil<double,Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,false,false>,
-                                     double>;
-
-#if HAVE_DUNE_FEM
-template class EclGenericTracerModel<Dune::CpGrid,
-                                     Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
-                                     Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>,
-                                     Opm::EcfvStencil<double,Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,false,false>,
-                                     double>;
-template class EclGenericTracerModel<Dune::CpGrid,
-                                     Dune::Fem::GridPart2GridViewImpl<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, (Dune::PartitionIteratorType)4, false> >,
-                                     Dune::MultipleCodimMultipleGeomTypeMapper<
-                                         Dune::Fem::GridPart2GridViewImpl<
-                                             Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false> > >,
-                                     Opm::EcfvStencil<double, Dune::Fem::GridPart2GridViewImpl<
-                                                                  Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false> >,
-                                                      false, false>,
-                                     double>;
-#endif // HAVE_DUNE_FEM
-
-} // namespace Opm

ebos/eclnewtonmethod.hh

@@ -1,269 +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 <http://www.gnu.org/licenses/>.
-
-  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
- *
- * \copydoc Opm::EclNewtonMethod
- */
-#ifndef EWOMS_ECL_NEWTON_METHOD_HH
-#define EWOMS_ECL_NEWTON_METHOD_HH
-
-#include <opm/common/Exceptions.hpp>
-#include <opm/common/OpmLog/OpmLog.hpp>
-
-#include <opm/models/blackoil/blackoilnewtonmethod.hh>
-#include <opm/models/utils/signum.hh>
-
-namespace Opm::Properties {
-
-template<class TypeTag, class MyTypeTag>
-struct EclNewtonSumTolerance {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct EclNewtonStrictIterations {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct EclNewtonRelaxedVolumeFraction {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct EclNewtonSumToleranceExponent {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct EclNewtonRelaxedTolerance {
-    using type = UndefinedProperty;
-};
-
-} // namespace Opm::Properties
-
-namespace Opm {
-
-/*!
- * \brief A newton solver which is ebos specific.
- */
-template <class TypeTag>
-class EclNewtonMethod : public BlackOilNewtonMethod<TypeTag>
-{
-    using ParentType = BlackOilNewtonMethod<TypeTag>;
-    using DiscNewtonMethod = GetPropType<TypeTag, Properties::DiscNewtonMethod>;
-
-    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using Linearizer = GetPropType<TypeTag, Properties::Linearizer>;
-    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-
-    static constexpr unsigned numEq = getPropValue<TypeTag, Properties::NumEq>();
-
-    static constexpr int contiSolventEqIdx = Indices::contiSolventEqIdx;
-    static constexpr int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
-    static constexpr int contiEnergyEqIdx = Indices::contiEnergyEqIdx;
-
-    friend NewtonMethod<TypeTag>;
-    friend DiscNewtonMethod;
-    friend ParentType;
-
-public:
-    EclNewtonMethod(Simulator& simulator) : ParentType(simulator)
-    {
-        errorPvFraction_ = 1.0;
-        relaxedMaxPvFraction_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclNewtonRelaxedVolumeFraction);
-
-        sumTolerance_ = 0.0; // this gets determined in the error calculation proceedure
-        relaxedTolerance_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclNewtonRelaxedTolerance);
-
-        numStrictIterations_ = EWOMS_GET_PARAM(TypeTag, int, EclNewtonStrictIterations);
-    }
-
-    /*!
-     * \brief Register all run-time parameters for the Newton method.
-     */
-    static void registerParameters()
-    {
-        ParentType::registerParameters();
-
-        EWOMS_REGISTER_PARAM(TypeTag, Scalar, EclNewtonSumTolerance,
-                             "The maximum error tolerated by the Newton"
-                             "method for considering a solution to be "
-                             "converged");
-        EWOMS_REGISTER_PARAM(TypeTag, int, EclNewtonStrictIterations,
-                             "The number of Newton iterations where the"
-                             " volumetric error is considered.");
-        EWOMS_REGISTER_PARAM(TypeTag, Scalar, EclNewtonRelaxedVolumeFraction,
-                             "The fraction of the pore volume of the reservoir "
-                             "where the volumetric error may be voilated during "
-                             "strict Newton iterations.");
-        EWOMS_REGISTER_PARAM(TypeTag, Scalar, EclNewtonSumToleranceExponent,
-                             "The the exponent used to scale the sum tolerance by "
-                             "the total pore volume of the reservoir.");
-        EWOMS_REGISTER_PARAM(TypeTag, Scalar, EclNewtonRelaxedTolerance,
-                             "The maximum error which the volumetric residual "
-                             "may exhibit if it is in a 'relaxed' "
-                             "region during a strict iteration.");
-    }
-
-    /*!
-     * \brief Returns true if the error of the solution is below the
-     *        tolerance.
-     */
-    bool converged() const
-    {
-        if (errorPvFraction_ < relaxedMaxPvFraction_)
-            return (this->error_ < relaxedTolerance_ && errorSum_ < sumTolerance_) ;
-        else if (this->numIterations() > numStrictIterations_)
-            return (this->error_ < relaxedTolerance_ && errorSum_ < sumTolerance_) ;
-
-        return this->error_ <= this->tolerance() && errorSum_ <= sumTolerance_;
-    }
-
-    void preSolve_(const SolutionVector&,
-                   const GlobalEqVector& currentResidual)
-    {
-        const auto& constraintsMap = this->model().linearizer().constraintsMap();
-        this->lastError_ = this->error_;
-        Scalar newtonMaxError = EWOMS_GET_PARAM(TypeTag, Scalar, NewtonMaxError);
-
-        // calculate the error as the maximum weighted tolerance of
-        // the solution's residual
-        this->error_ = 0.0;
-        Dune::FieldVector<Scalar, numEq> componentSumError;
-        std::fill(componentSumError.begin(), componentSumError.end(), 0.0);
-        Scalar sumPv = 0.0;
-        errorPvFraction_ = 0.0;
-        const Scalar dt = this->simulator_.timeStepSize();
-        for (unsigned dofIdx = 0; dofIdx < currentResidual.size(); ++dofIdx) {
-            // do not consider auxiliary DOFs for the error
-            if (dofIdx >= this->model().numGridDof()
-                || this->model().dofTotalVolume(dofIdx) <= 0.0)
-                continue;
-
-            if (!this->model().isLocalDof(dofIdx))
-                continue;
-
-            // also do not consider DOFs which are constraint
-            if (this->enableConstraints_()) {
-                if (constraintsMap.count(dofIdx) > 0)
-                    continue;
-            }
-
-            const auto& r = currentResidual[dofIdx];
-            Scalar pvValue =
-                this->simulator_.problem().referencePorosity(dofIdx, /*timeIdx=*/0)
-                * this->model().dofTotalVolume(dofIdx);
-            sumPv += pvValue;
-            bool cnvViolated = false;
-
-            Scalar dofVolume = this->model().dofTotalVolume(dofIdx);
-
-            for (unsigned eqIdx = 0; eqIdx < r.size(); ++eqIdx) {
-                Scalar tmpError = r[eqIdx] * dt * this->model().eqWeight(dofIdx, eqIdx) / pvValue;
-                Scalar tmpError2 = r[eqIdx] * this->model().eqWeight(dofIdx, eqIdx);
-
-                // in the case of a volumetric formulation, the residual in the above is
-                // per cubic meter
-                if (getPropValue<TypeTag, Properties::UseVolumetricResidual>()) {
-                    tmpError *= dofVolume;
-                    tmpError2 *= dofVolume;
-                }
-
-                this->error_ = max(std::abs(tmpError), this->error_);
-
-                if (std::abs(tmpError) > this->tolerance_)
-                    cnvViolated = true;
-
-                componentSumError[eqIdx] += std::abs(tmpError2);
-            }
-            if (cnvViolated)
-                errorPvFraction_ += pvValue;
-        }
-
-        // take the other processes into account
-        this->error_ = this->comm_.max(this->error_);
-        componentSumError = this->comm_.sum(componentSumError);
-        sumPv = this->comm_.sum(sumPv);
-        errorPvFraction_ = this->comm_.sum(errorPvFraction_);
-
-        componentSumError /= sumPv;
-        componentSumError *= dt;
-
-        errorPvFraction_ /= sumPv;
-
-        errorSum_ = 0;
-        for (unsigned eqIdx = 0; eqIdx < numEq; ++eqIdx)
-            errorSum_ = std::max(std::abs(componentSumError[eqIdx]), errorSum_);
-
-        // scale the tolerance for the total error with the pore volume. by default, the
-        // exponent is 1/3, i.e., cubic root.
-        Scalar x = EWOMS_GET_PARAM(TypeTag, Scalar, EclNewtonSumTolerance);
-        Scalar y = EWOMS_GET_PARAM(TypeTag, Scalar, EclNewtonSumToleranceExponent);
-        sumTolerance_ = x*std::pow(sumPv, y);
-
-        this->endIterMsg() << " (max: " << this->tolerance_ << ", violated for " << errorPvFraction_*100 << "% of the pore volume), aggegate error: " << errorSum_ << " (max: " << sumTolerance_ << ")";
-
-        // make sure that the error never grows beyond the maximum
-        // allowed one
-        if (this->error_ > newtonMaxError)
-            throw NumericalProblem("Newton: Error "+std::to_string(double(this->error_))
-                                   + " is larger than maximum allowed error of "
-                                   + std::to_string(double(newtonMaxError)));
-
-        // make sure that the error never grows beyond the maximum
-        // allowed one
-        if (errorSum_ > newtonMaxError)
-            throw NumericalProblem("Newton: Sum of the error "+std::to_string(double(errorSum_))
-                                   + " is larger than maximum allowed error of "
-                                   + std::to_string(double(newtonMaxError)));
-    }
-
-    void endIteration_(SolutionVector& nextSolution,
-                       const SolutionVector& currentSolution)
-    {
-        ParentType::endIteration_(nextSolution, currentSolution);
-        OpmLog::debug( "Newton iteration " + std::to_string(this->numIterations_) + ""
-                  + " error: " + std::to_string(double(this->error_))
-                  + this->endIterMsg().str());
-        this->endIterMsg().str("");
-    }
-
-private:
-    Scalar errorPvFraction_;
-    Scalar errorSum_;
-
-    Scalar relaxedTolerance_;
-    Scalar relaxedMaxPvFraction_;
-
-    Scalar sumTolerance_;
-
-    int numStrictIterations_;
-};
-} // namespace Opm
-
-#endif

ebos/ecltransmissibility.cc

@@ -1,66 +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 <http://www.gnu.org/licenses/>.
-
-  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.
-*/
-
-#include <config.h>
-#include <ebos/ecltransmissibility.hh>
-#include <ebos/ecltransmissibility_impl.hh>
-
-#include <opm/grid/CpGrid.hpp>
-
-#if HAVE_DUNE_FEM
-#include <dune/fem/gridpart/adaptiveleafgridpart.hh>
-#include <dune/fem/gridpart/common/gridpart2gridview.hh>
-#include <ebos/femcpgridcompat.hh>
-#endif
-
-namespace Opm {
-
-template class EclTransmissibility<Dune::CpGrid,
-                                   Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
-                                   Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
-                                   Dune::CartesianIndexMapper<Dune::CpGrid>,
-                                   double>;
-
-#ifdef HAVE_DUNE_FEM
-template class EclTransmissibility<Dune::CpGrid,
-                                   Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
-                                   Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>,
-                                   Dune::CartesianIndexMapper<Dune::CpGrid>,
-                                   double>;
-template class EclTransmissibility<Dune::CpGrid,
-                                   Dune::Fem::GridPart2GridViewImpl<
-                                       Dune::Fem::AdaptiveLeafGridPart<
-                                           Dune::CpGrid,
-                                           Dune::PartitionIteratorType(4),
-                                           false> >,
-                                   Dune::MultipleCodimMultipleGeomTypeMapper<
-                                       Dune::Fem::GridPart2GridViewImpl<
-                                           Dune::Fem::AdaptiveLeafGridPart<
-                                               Dune::CpGrid,
-                                               Dune::PartitionIteratorType(4),
-                                               false> > >,
-                                   Dune::CartesianIndexMapper<Dune::CpGrid>,
-                                   double>;
-#endif // HAVE_DUNE_FEM
-
-} // namespace Opm

flow/flow_blackoil.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_blackoil.hpp>
+#include <flow/flow_blackoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_blackoil.hpp

@@ -14,10 +14,11 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_BLACKOIL_TPFA_HPP
-#define FLOW_EBOS_BLACKOIL_TPFA_HPP
+#ifndef FLOW_BLACKOIL_TPFA_HPP
+#define FLOW_BLACKOIL_TPFA_HPP
 
 #include <memory>
+#include <tuple>
 
 namespace Opm::Properties::TTag {
     struct FlowProblem;
@@ -42,4 +43,4 @@ int flowBlackoilTpfaMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_BLACKOIL_TPFA_HPP
+#endif // FLOW_BLACKOIL_TPFA_HPP

flow/flow_blackoil_alugrid.cpp

@@ -27,14 +27,14 @@
 #include <opm/grid/cpgrid/GridHelpers.hpp>
 
 // these are not explicitly instanced in library
-#include <ebos/eclgenericproblem_impl.hh>
-#include <ebos/eclgenericthresholdpressure_impl.hh>
-#include <ebos/eclgenerictracermodel_impl.hh>
-#include <ebos/eclgenericwriter_impl.hh>
-#include <ebos/ecltransmissibility_impl.hh>
-#include <ebos/equil/initstateequil_impl.hh>
 #include <opm/simulators/flow/AluGridVanguard.hpp>
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
+#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
+#include <opm/simulators/flow/FlowGenericProblem_impl.hpp>
+#include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
+#include <opm/simulators/flow/GenericTracerModel_impl.hpp>
+#include <opm/simulators/flow/Transmissibility_impl.hpp>
+#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
 #include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 namespace Opm {

flow/flow_blackoil_legacyassembly.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_blackoil_legacyassembly.hpp>
+#include <flow/flow_blackoil_legacyassembly.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>

flow/flow_blackoil_legacyassembly_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_blackoil_legacyassembly.hpp>
+#include <flow/flow_blackoil_legacyassembly.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_blackoil_main.cpp

@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <flow/flow_ebos_blackoil.hpp>
+#include <flow/flow_blackoil.hpp>
 
 int main(int argc, char** argv)
 {

flow/flow_blackoil_polyhedralgrid.cpp

@@ -18,21 +18,22 @@
 */
 #include <config.h>
 
-#include <ebos/eclpolyhedralgridvanguard.hh>
-
 #include <opm/grid/polyhedralgrid.hh>
+
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/simulators/flow/PolyhedralGridVanguard.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 // these are not explicitly instanced in library
-#include <ebos/eclgenericproblem_impl.hh>
-#include <ebos/eclgenericthresholdpressure_impl.hh>
-#include <ebos/eclgenerictracermodel_impl.hh>
-#include <ebos/ecltransmissibility_impl.hh>
-#include <ebos/eclgenericwriter_impl.hh>
-#include <ebos/equil/initstateequil_impl.hh>
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
+#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
+#include <opm/simulators/flow/FlowGenericProblem_impl.hpp>
+#include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
+#include <opm/simulators/flow/GenericTracerModel_impl.hpp>
+#include <opm/simulators/flow/Transmissibility_impl.hpp>
+#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
 #include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 namespace Opm {
@@ -64,7 +65,7 @@ namespace Properties {
 
     template<class TypeTag>
     struct Vanguard<TypeTag, TTag::FlowProblemPoly> {
-        using type = Opm::EclPolyhedralGridVanguard<TypeTag>;
+        using type = Opm::PolyhedralGridVanguard<TypeTag>;
     };
 }
 }

flow/flow_brine.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_brine.hpp>
+#include <flow/flow_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_brine.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_BRINE_HPP
-#define FLOW_EBOS_BRINE_HPP
+#ifndef FLOW_BRINE_HPP
+#define FLOW_BRINE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowBrineMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_BRINE_HPP
+#endif // FLOW_EBOS_HPP

flow/flow_brine_energy.hpp

@@ -15,8 +15,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FLOW_EBOS_BRINE_ENERGY_HPP
-#define FLOW_EBOS_BRINE_ENERGY_HPP
+#ifndef FLOW_BRINE_ENERGY_HPP
+#define FLOW_BRINE_ENERGY_HPP
 
 namespace Opm {
   int flowBrineEnergyMain(int argc, char** argv);

flow/flow_brine_energy_main.cpp

@@ -15,8 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_brine_energy.hpp>
-
+#include <flow/flow_brine_energy.hpp>
 
 int main(int argc, char** argv)
 {

flow/flow_brine_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_brine.hpp>
+#include <flow/flow_brine.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_brine_precsalt_vapwat.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
+#include <flow/flow_brine_precsalt_vapwat.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_brine_precsalt_vapwat.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
-#define FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
+#ifndef FLOW_BRINE_PRECSALT_VAPWAT_HPP
+#define FLOW_BRINE_PRECSALT_VAPWAT_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowBrinePrecsaltVapwatMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
+#endif // FLOW_BRINE_PRECSALT_VAPWAT_HPP

flow/flow_brine_precsalt_vapwat_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
+#include <flow/flow_brine_precsalt_vapwat.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_brine_saltprecipitation.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_brine_saltprecipitation.hpp>
+#include <flow/flow_brine_saltprecipitation.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_brine_saltprecipitation.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
-#define FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
+#ifndef FLOW_BRINE_SALTPRECIPITATION_HPP
+#define FLOW_BRINE_SALTPRECIPITATION_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowBrineSaltPrecipitationMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_BRINE_HPP
+#endif // FLOW_BRINE_HPP

flow/flow_brine_saltprecipitation_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_brine_saltprecipitation.hpp>
+#include <flow/flow_brine_saltprecipitation.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_distribute_z.cpp

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <opm/simulators/flow/Main.hpp>
-#include <ebos/eclcpgridvanguard.hh>
+#include <opm/simulators/flow/CpGridVanguard.hpp>
 
 std::vector<int> loadBalanceInZOnly(const Dune::CpGrid& grid)
 {
@@ -61,7 +61,7 @@ std::vector<int> loadBalanceInZOnly(const Dune::CpGrid& grid)
 int main(int argc, char** argv)
 {
     auto mainObject = std::make_unique<Opm::Main>(argc, argv);
-    Opm::EclCpGridVanguard<Opm::Properties::TTag::FlowProblem>::setExternalLoadBalancer(loadBalanceInZOnly);
+    Opm::CpGridVanguard<Opm::Properties::TTag::FlowProblem>::setExternalLoadBalancer(loadBalanceInZOnly);
     auto ret = mainObject->runDynamic();
     // Destruct mainObject as the destructor calls MPI_Finalize!
     mainObject.reset();

flow/flow_energy.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_energy.hpp>
+#include <flow/flow_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_energy.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_ENERGY_HPP
-#define FLOW_EBOS_ENERGY_HPP
+#ifndef FLOW_ENERGY_HPP
+#define FLOW_ENERGY_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowEnergyMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_ENERGY_HPP
+#endif // FLOW_ENERGY_HPP

flow/flow_energy_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_energy.hpp>
+#include <flow/flow_energy.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_extbo.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_extbo.hpp>
+#include <flow/flow_extbo.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_extbo.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_EXTBO_HPP
-#define FLOW_EBOS_EXTBO_HPP
+#ifndef FLOW_EXTBO_HPP
+#define FLOW_EXTBO_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowExtboMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_EXTBO_HPP
+#endif // FLOW_EXTBO_HPP

flow/flow_extbo_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_extbo.hpp>
+#include <flow/flow_extbo.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_foam.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_foam.hpp>
+#include <flow/flow_foam.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_foam.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_FOAM_HPP
-#define FLOW_EBOS_FOAM_HPP
+#ifndef FLOW_FOAM_HPP
+#define FLOW_FOAM_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowFoamMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_FOAM_HPP
+#endif // FLOW_FOAM_HPP

flow/flow_foam_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_foam.hpp>
+#include <flow/flow_foam.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gasoil.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gasoil.hpp>
+#include <flow/flow_gasoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gasoil.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASOIL_HPP
-#define FLOW_EBOS_GASOIL_HPP
+#ifndef FLOW_GASOIL_HPP
+#define FLOW_GASOIL_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasOilMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASOIL_HPP
+#endif // FLOW_GASOIL_HPP

flow/flow_gasoil_energy.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gasoil_energy.hpp>
+#include <flow/flow_gasoil_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gasoil_energy.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASOIL_ENERGY_HPP
-#define FLOW_EBOS_GASOIL_ENERGY_HPP
+#ifndef FLOW_GASOIL_ENERGY_HPP
+#define FLOW_GASOIL_ENERGY_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasOilEnergyMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASOIL_ENERGY_HPP
+#endif // FLOW_GASOIL_ENERGY_HPP

flow/flow_gasoil_energy_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gasoil_energy.hpp>
+#include <flow/flow_gasoil_energy.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gasoil_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gasoil.hpp>
+#include <flow/flow_gasoil.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gasoildiffuse.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gasoil.hpp>
+#include <flow/flow_gasoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gasoildiffuse.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASOILDIFFUSE_HPP
-#define FLOW_EBOS_GASOILDIFFUSE_HPP
+#ifndef FLOW_GASOILDIFFUSE_HPP
+#define FLOW_GASOILDIFFUSE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasOilDiffuseMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASOILDIFFUSE_HPP
+#endif // FLOW_GASOILDIFFUSE_HPP

flow/flow_gasoildiffuse_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gasoildiffuse.hpp>
+#include <flow/flow_gasoildiffuse.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater.cpp

@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <flow/flow_ebos_gaswater.hpp>
+#include <flow/flow_gaswater.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_HPP
-#define FLOW_EBOS_GASWATER_HPP
+#ifndef FLOW_GASWATER_HPP
+#define FLOW_GASWATER_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_HPP
+#endif // FLOW_GASWATER_HPP

flow/flow_gaswater_brine.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gaswater_brine.hpp>
+#include <flow/flow_gaswater_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_brine.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_BRINE_HPP
-#define FLOW_EBOS_GASWATER_BRINE_HPP
+#ifndef FLOW_GASWATER_BRINE_HPP
+#define FLOW_GASWATER_BRINE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterBrineMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_BRINE_HPP
+#endif // FLOW_GASWATER_BRINE_HPP

flow/flow_gaswater_brine_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_brine.hpp>
+#include <flow/flow_gaswater_brine.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_dissolution.cpp

@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <flow/flow_ebos_gaswater_dissolution.hpp>
+#include <flow/flow_gaswater_dissolution.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_dissolution.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_DISSOLUTION_HPP
-#define FLOW_EBOS_GASWATER_DISSOLUTION_HPP
+#ifndef FLOW_GASWATER_DISSOLUTION_HPP
+#define FLOW_GASWATER_DISSOLUTION_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterDissolutionMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_DISSOLUTION_HPP
+#endif // FLOW_GASWATER_DISSOLUTION_HPP

flow/flow_gaswater_dissolution_diffuse.cpp

@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
+#include <flow/flow_gaswater_dissolution_diffuse.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_dissolution_diffuse.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
-#define FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
+#ifndef FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP
+#define FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
+#endif // FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP

flow/flow_gaswater_dissolution_diffuse_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
+#include <flow/flow_gaswater_dissolution_diffuse.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_dissolution_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_dissolution.hpp>
+#include <flow/flow_gaswater_dissolution.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_energy.cpp

@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <flow/flow_ebos_gaswater_energy.hpp>
+#include <flow/flow_gaswater_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_energy.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_ENERGY_HPP
-#define FLOW_EBOS_GASWATER_ENERGY_HPP
+#ifndef FLOW_GASWATER_ENERGY_HPP
+#define FLOW_GASWATER_ENERGY_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterEnergyMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_ENERGY_HPP
+#endif // FLOW_GASWATER_ENERGY_HPP

flow/flow_gaswater_energy_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_energy.hpp>
+#include <flow/flow_gaswater_energy.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater.hpp>
+#include <flow/flow_gaswater.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_saltprec_energy.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
+#include <flow/flow_gaswater_saltprec_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_saltprec_energy.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
-#define FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
+#ifndef FLOW_GASWATER_SALTPREC_ENERGY_HPP
+#define FLOW_GASWATER_SALTPREC_ENERGY_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterSaltprecEnergyMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
+#endif // FLOW_GASWATER_SALTPREC_ENERGY_HPP

flow/flow_gaswater_saltprec_energy_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
+#include <flow/flow_gaswater_saltprec_energy.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_saltprec_vapwat.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
+#include <flow/flow_gaswater_saltprec_vapwat.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_saltprec_vapwat.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATERSALTPRECVAPWAT_BRINE_HPP
-#define FLOW_EBOS_GASWATERSALTPRECVAPWAT_BRINE_HPP
+#ifndef FLOW_GASWATERSALTPRECVAPWAT_BRINE_HPP
+#define FLOW_GASWATERSALTPRECVAPWAT_BRINE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterSaltprecVapwatMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATERSALTPRECVAPWAT_HPP
+#endif // FLOW_GASWATERSALTPRECVAPWAT_HPP

flow/flow_gaswater_saltprec_vapwat_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
+#include <flow/flow_gaswater_saltprec_vapwat.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_gaswater_solvent.cpp

@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <flow/flow_ebos_gaswater_solvent.hpp>
+#include <flow/flow_gaswater_solvent.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_gaswater_solvent.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_GASWATER_SOLVENT_HPP
-#define FLOW_EBOS_GASWATER_SOLVENT_HPP
+#ifndef FLOW_GASWATER_SOLVENT_HPP
+#define FLOW_GASWATER_SOLVENT_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowGasWaterSolventMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_GASWATER_SOLVENT_HPP
+#endif // FLOW_GASWATER_SOLVENT_HPP

flow/flow_gaswater_solvent_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_gaswater_solvent.hpp>
+#include <flow/flow_gaswater_solvent.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_micp.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_micp.hpp>
+#include <flow/flow_micp.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>

flow/flow_micp.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_MICP_HPP
-#define FLOW_EBOS_MICP_HPP
+#ifndef FLOW_MICP_HPP
+#define FLOW_MICP_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowMICPMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_MICP_HPP
+#endif // FLOW_MICP_HPP

flow/flow_micp_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_micp.hpp>
+#include <flow/flow_micp.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_oilwater.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_oilwater.hpp>
+#include <flow/flow_oilwater.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_oilwater.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_OILWATER_HPP
-#define FLOW_EBOS_OILWATER_HPP
+#ifndef FLOW_OILWATER_HPP
+#define FLOW_OILWATER_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowOilWaterMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_OILWATER_HPP
+#endif // FLOW_OILWATER_HPP

flow/flow_oilwater_brine.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_oilwater_brine.hpp>
+#include <flow/flow_oilwater_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_oilwater_brine.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_OILWATER_BRINE_HPP
-#define FLOW_EBOS_OILWATER_BRINE_HPP
+#ifndef FLOW_OILWATER_BRINE_HPP
+#define FLOW_OILWATER_BRINE_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowOilWaterBrineMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_OILWATER_BRINE_HPP
+#endif // FLOW_OILWATER_BRINE_HPP

flow/flow_oilwater_brine_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_oilwater_brine.hpp>
+#include <flow/flow_oilwater_brine.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_oilwater_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_oilwater.hpp>
+#include <flow/flow_oilwater.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_oilwater_polymer.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_oilwater_polymer.hpp>
+#include <flow/flow_oilwater_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_oilwater_polymer.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_OILWATER_POLYMER_HPP
-#define FLOW_EBOS_OILWATER_POLYMER_HPP
+#ifndef FLOW_OILWATER_POLYMER_HPP
+#define FLOW_OILWATER_POLYMER_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowOilWaterPolymerMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_OILWATER_POLYMER_HPP
+#endif // FLOW_OILWATER_POLYMER_HPP

flow/flow_oilwater_polymer_injectivity.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
+#include <flow/flow_oilwater_polymer_injectivity.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>

flow/flow_oilwater_polymer_injectivity.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
-#define FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
+#ifndef FLOW_OILWATER_POLYMER_INJECTIVITY_HPP
+#define FLOW_OILWATER_POLYMER_INJECTIVITY_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowOilWaterPolymerInjectivityMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
+#endif // FLOW_OILWATER_POLYMER_INJECTIVITY_HPP

flow/flow_oilwater_polymer_injectivity_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
+#include <flow/flow_oilwater_polymer_injectivity.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_oilwater_polymer_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_oilwater_polymer.hpp>
+#include <flow/flow_oilwater_polymer.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_onephase_energy.cpp

@@ -20,7 +20,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_onephase_energy.hpp>
+#include <flow/flow_onephase_energy.hpp>
 
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>

flow/flow_onephase_energy_main.cpp

@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_onephase_energy.hpp>
+#include <flow/flow_onephase_energy.hpp>
 
 int main(int argc, char** argv)
 {

flow/flow_onephase_main.cpp

@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_onephase.hpp>
+#include <flow/flow_onephase.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_polymer.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_polymer.hpp>
+#include <flow/flow_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_polymer.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_POLYMER_HPP
-#define FLOW_EBOS_POLYMER_HPP
+#ifndef FLOW_POLYMER_HPP
+#define FLOW_POLYMER_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowPolymerMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_POLYMER_HPP
+#endif // FLOW_POLYMER_HPP

flow/flow_polymer_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_polymer.hpp>
+#include <flow/flow_polymer.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_solvent.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_solvent.hpp>
+#include <flow/flow_solvent.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_solvent.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_SOLVENT_HPP
-#define FLOW_EBOS_SOLVENT_HPP
+#ifndef FLOW_SOLVENT_HPP
+#define FLOW_SOLVENT_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowSolventMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_SOLVENT_HPP
+#endif // FLOW_SOLVENT_HPP

flow/flow_solvent_foam.cpp

@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <flow/flow_ebos_solvent_foam.hpp>
+#include <flow/flow_solvent_foam.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

flow/flow_solvent_foam.hpp

@@ -14,8 +14,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FLOW_EBOS_SOLVENT_FOAM_HPP
-#define FLOW_EBOS_SOLVENT_FOAM_HPP
+#ifndef FLOW_SOLVENT_FOAM_HPP
+#define FLOW_SOLVENT_FOAM_HPP
 
 namespace Opm {
 
@@ -27,4 +27,4 @@ int flowSolventFoamMainStandalone(int argc, char** argv);
 
 }
 
-#endif // FLOW_EBOS_SOLVENT_FOAM_HPP
+#endif // FLOW_SOLVENT_FOAM_HPP

flow/flow_solvent_foam_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_solvent_foam.hpp>
+#include <flow/flow_solvent_foam.hpp>
 
 
 int main(int argc, char** argv)

flow/flow_solvent_main.cpp

@@ -15,7 +15,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <flow/flow_ebos_solvent.hpp>
+#include <flow/flow_solvent.hpp>
 
 
 int main(int argc, char** argv)