changed: ewoms/common -> opm/models/utils

2024-12-24 00:10:02 -06:00 · 2019-09-16 10:58:20 +02:00 · 2019-09-16 10:58:20 +02:00 · d3d9831fc3
commit d3d9831fc3
parent 7048589ec1
26 changed files with 35 additions and 35 deletions
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@ -34,7 +34,7 @@
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/linalg/ISTLSolverEbos.hpp>

-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 namespace Opm {
 template <class TypeTag>
--- a/ebos/ebos_plain.cc
+++ b/ebos/ebos_plain.cc
@ -29,7 +29,7 @@

 #include "eclproblem.hh"

-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 BEGIN_PROPERTIES

--- a/ebos/eclbaseaquifermodel.hh
+++ b/ebos/eclbaseaquifermodel.hh
@ -27,7 +27,7 @@
 #ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH
 #define EWOMS_ECL_BASE_AQUIFER_MODEL_HH

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 BEGIN_PROPERTIES

--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@ -28,8 +28,8 @@
 #define EWOMS_ECL_BASE_VANGUARD_HH

 #include <ewoms/io/basevanguard.hh>
-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>

 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/cpgrid/GridHelpers.hpp>
--- a/ebos/eclequilinitializer.hh
+++ b/ebos/eclequilinitializer.hh
@ -30,7 +30,7 @@

 #include "equil/initstateequil.hh"

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>

 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
--- a/ebos/eclfluxmodule.hh
+++ b/ebos/eclfluxmodule.hh
@ -33,7 +33,7 @@

 #include <ewoms/disc/common/fvbaseproperties.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
-#include <ewoms/common/signum.hh>
+#include <opm/models/utils/signum.hh>

 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Exceptions.hpp>
--- a/ebos/eclnewtonmethod.hh
+++ b/ebos/eclnewtonmethod.hh
@ -29,7 +29,7 @@
 #define EWOMS_ECL_NEWTON_METHOD_HH

 #include <opm/models/blackoil/blackoilnewtonmethod.hh>
-#include <ewoms/common/signum.hh>
+#include <opm/models/utils/signum.hh>

 #include <opm/material/common/Unused.hpp>

--- a/ebos/ecloutputblackoilmodule.hh
+++ b/ebos/ecloutputblackoilmodule.hh
@ -31,8 +31,8 @@

 #include <opm/models/blackoil/blackoilproperties.hh>

-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>

 #include <opm/material/common/Valgrind.hpp>

--- a/ebos/eclpeacemanwell.hh
+++ b/ebos/eclpeacemanwell.hh
@ -30,8 +30,8 @@

 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <ewoms/disc/common/baseauxiliarymodule.hh>
-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/alignedallocator.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/alignedallocator.hh>

 #include <opm/material/fluidstates/CompositionalFluidState.hpp>
 #include <opm/material/densead/Evaluation.hpp>
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@ -64,7 +64,7 @@
 #include "ecltracermodel.hh"
 #include "vtkecltracermodule.hh"

-#include <ewoms/common/pffgridvector.hh>
+#include <opm/models/utils/pffgridvector.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <ewoms/disc/ecfv/ecfvdiscretization.hh>

--- a/ebos/eclthresholdpressure.hh
+++ b/ebos/eclthresholdpressure.hh
@ -28,7 +28,7 @@
 #ifndef EWOMS_ECL_THRESHOLD_PRESSURE_HH
 #define EWOMS_ECL_THRESHOLD_PRESSURE_HH

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/densead/Math.hpp>
--- a/ebos/ecltransmissibility.hh
+++ b/ebos/ecltransmissibility.hh
@ -30,7 +30,7 @@

 #include <ebos/nncsorter.hpp>

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp>
--- a/ebos/eclwellmanager.hh
+++ b/ebos/eclwellmanager.hh
@ -42,7 +42,7 @@
 #include <opm/output/data/Wells.hpp>
 #include <opm/material/common/Exceptions.hpp>

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>
 #include <opm/models/parallel/threadedentityiterator.hh>

 #include <dune/grid/common/gridenums.hh>
--- a/ebos/equil/initstateequil.hh
+++ b/ebos/equil/initstateequil.hh
@ -32,7 +32,7 @@
 #include "equilibrationhelpers.hh"
 #include "opm/grid/utility/RegionMapping.hpp"

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <opm/grid/cpgrid/GridHelpers.hpp>

--- a/ebos/mebos_main.cc
+++ b/ebos/mebos_main.cc
@ -40,7 +40,7 @@
 #include "ebos_polymer.hh"
 #include "ebos_foam.hh"

-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/timer.hh>
--- a/ebos/vtkecltracermodule.hh
+++ b/ebos/vtkecltracermodule.hh
@ -31,8 +31,8 @@
 #include <ewoms/io/vtkmultiwriter.hh>
 #include <ewoms/io/baseoutputmodule.hh>

-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>


--- a/flow/flow.cpp
+++ b/flow/flow.cpp
@ -33,8 +33,8 @@
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/simulators/flow/FlowMainEbos.hpp>
 #include <opm/simulators/utils/moduleVersion.hpp>
-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>
 #include <opm/simulators/flow/MissingFeatures.hpp>
 #include <opm/material/common/ResetLocale.hpp>

--- a/flow/flow_tag.hpp
+++ b/flow/flow_tag.hpp
@ -24,8 +24,8 @@
 #include <opm/simulators/flow/FlowMainEbos.hpp>
 #include <opm/simulators/flow/MissingFeatures.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/material/common/ResetLocale.hpp>

--- a/opm/simulators/flow/BlackoilModelEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelEbos.hpp
@ -25,7 +25,7 @@
 #define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED

 #include <ebos/eclproblem.hh>
-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>

--- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelParametersEbos.hpp
@ -20,8 +20,8 @@
 #ifndef OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED
 #define OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED

-#include <ewoms/common/propertysystem.hh>
-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>

 #include <string>

--- a/opm/simulators/flow/NonlinearSolverEbos.hpp
+++ b/opm/simulators/flow/NonlinearSolverEbos.hpp
@ -27,8 +27,8 @@
 #include <opm/common/Exceptions.hpp>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>

-#include <ewoms/common/parametersystem.hh>
-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <dune/common/fmatrix.hh>
 #include <dune/istl/bcrsmatrix.hh>
--- a/opm/simulators/linalg/FlowLinearSolverParameters.hpp
+++ b/opm/simulators/linalg/FlowLinearSolverParameters.hpp
@ -27,7 +27,7 @@
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>

-#include <ewoms/common/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hh>

 #include <array>
 #include <memory>
--- a/opm/simulators/linalg/ISTLSolverEbos.hpp
+++ b/opm/simulators/linalg/ISTLSolverEbos.hpp
@ -33,8 +33,8 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>

-#include <ewoms/common/parametersystem.hh>
-#include <ewoms/common/propertysystem.hh>
+#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <dune/istl/scalarproducts.hh>
 #include <dune/istl/operators.hh>
--- a/tests/test_ecl_output.cc
+++ b/tests/test_ecl_output.cc
@ -24,7 +24,7 @@

 #include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/grid/GridManager.hpp>
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@ -24,7 +24,7 @@

 #include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/grid/GridManager.hpp>
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@ -44,7 +44,7 @@
 #include <opm/simulators/flow/BlackoilModelEbos.hpp>

 #include <ebos/eclproblem.hh>
-#include <ewoms/common/start.hh>
+#include <opm/models/utils/start.hh>

 #include <opm/simulators/wells/StandardWell.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>