changed: opm/[core -> common]/utility/parameters

2025-02-25 18:55:30 -06:00 · 2018-01-30 13:25:35 +01:00
parent e9e5c15e99
commit 141186ad1d
53 changed files with 53 additions and 53 deletions
--- a/opm/autodiff/BlackoilModelBase_impl.hpp
+++ b/opm/autodiff/BlackoilModelBase_impl.hpp
@@ -48,7 +48,7 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/core/well_controls.h>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>

--- a/opm/autodiff/BlackoilModelEbos.hpp
+++ b/opm/autodiff/BlackoilModelEbos.hpp
@@ -42,7 +42,7 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>

--- a/opm/autodiff/BlackoilModelParameters.cpp
+++ b/opm/autodiff/BlackoilModelParameters.cpp
@@ -18,7 +18,7 @@
 */

 #include <opm/autodiff/BlackoilModelParameters.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>

 namespace Opm
--- a/opm/autodiff/BlackoilOutputEbos.hpp
+++ b/opm/autodiff/BlackoilOutputEbos.hpp
@@ -29,7 +29,7 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>

--- a/opm/autodiff/CPRPreconditioner.hpp
+++ b/opm/autodiff/CPRPreconditioner.hpp
@@ -28,7 +28,7 @@
 #include <type_traits>

 #include <opm/common/utility/platform_dependent/disable_warnings.h>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>

 #include <dune/istl/bvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -47,7 +47,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/simulators/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available). \TODO: Fix.

 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
--- a/opm/autodiff/NewtonIterationBlackoilCPR.hpp
+++ b/opm/autodiff/NewtonIterationBlackoilCPR.hpp
@@ -27,7 +27,7 @@
 #include <opm/autodiff/DuneMatrix.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
 #include <opm/autodiff/CPRPreconditioner.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <dune/istl/scalarproducts.hh>
 #include <dune/istl/operators.hh>
--- a/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp
+++ b/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp
@@ -26,7 +26,7 @@
 #define OPM_NEWTONITERATIONBLACKOILINTERLEAVED_HEADER_INCLUDED

 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>

 #include <array>
 #include <memory>
--- a/opm/autodiff/NewtonIterationBlackoilSimple.hpp
+++ b/opm/autodiff/NewtonIterationBlackoilSimple.hpp
@@ -23,7 +23,7 @@


 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <memory>

--- a/opm/autodiff/NonlinearSolver.hpp
+++ b/opm/autodiff/NonlinearSolver.hpp
@@ -22,7 +22,7 @@
 #define OPM_NONLINEARSOLVER_HEADER_INCLUDED

 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/bcrsmatrix.hh>
--- a/opm/autodiff/SimulatorBase.hpp
+++ b/opm/autodiff/SimulatorBase.hpp
@@ -25,7 +25,7 @@
 #include <opm/autodiff/DuneMatrix.hpp>

 #include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>

 #include <opm/autodiff/GeoProps.hpp>
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
@@ -27,7 +27,7 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
--- a/opm/autodiff/SimulatorIncompTwophaseAd.cpp
+++ b/opm/autodiff/SimulatorIncompTwophaseAd.cpp
@@ -24,7 +24,7 @@

 #include <opm/autodiff/SimulatorIncompTwophaseAd.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>

 #include <opm/core/pressure/IncompTpfa.hpp>
--- a/opm/autodiff/TransportSolverTwophaseAd.cpp
+++ b/opm/autodiff/TransportSolverTwophaseAd.cpp
@@ -24,7 +24,7 @@
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <iostream>
--- a/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
+++ b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
@@ -26,7 +26,7 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 #include <opm/core/utility/VelocityInterpolation.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/utility/numeric/blas_lapack.h>

 #include <algorithm>
--- a/opm/core/linalg/LinearSolverFactory.cpp
+++ b/opm/core/linalg/LinearSolverFactory.cpp
@@ -35,7 +35,7 @@
 #include <opm/core/linalg/LinearSolverPetsc.hpp>
 #endif

-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <string>

--- a/opm/core/linalg/LinearSolverIstl.hpp
+++ b/opm/core/linalg/LinearSolverIstl.hpp
@@ -22,7 +22,7 @@


 #include <opm/core/linalg/LinearSolverInterface.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <string>
 #include <boost/any.hpp>

--- a/opm/core/linalg/LinearSolverPetsc.hpp
+++ b/opm/core/linalg/LinearSolverPetsc.hpp
@@ -26,7 +26,7 @@
 #endif

 #include <opm/core/linalg/LinearSolverInterface.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <string>

 namespace Opm
--- a/opm/core/props/BlackoilPropertiesBasic.hpp
+++ b/opm/core/props/BlackoilPropertiesBasic.hpp
@@ -25,7 +25,7 @@
 #include <opm/core/props/rock/RockBasic.hpp>
 #include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
 #include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>

 namespace Opm
 {
--- a/opm/core/props/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.cpp
@@ -21,7 +21,7 @@
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/compressedToCartesian.hpp>
 #include <opm/core/utility/extractPvtTableIndex.hpp>
 #include <vector>
--- a/opm/core/props/BlackoilPropertiesFromDeck.hpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp>
--- a/opm/core/props/pvt/PvtPropertiesBasic.hpp
+++ b/opm/core/props/pvt/PvtPropertiesBasic.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_PVTPROPERTIESBASIC_HEADER_INCLUDED
 #define OPM_PVTPROPERTIESBASIC_HEADER_INCLUDED

-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <vector>

--- a/opm/core/props/rock/RockCompressibility.cpp
+++ b/opm/core/props/rock/RockCompressibility.cpp
@@ -19,7 +19,7 @@

 #include "config.h"
 #include <opm/core/props/rock/RockCompressibility.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
--- a/opm/core/props/satfunc/SaturationPropsBasic.hpp
+++ b/opm/core/props/satfunc/SaturationPropsBasic.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_SATURATIONPROPSBASIC_HEADER_INCLUDED
 #define OPM_SATURATIONPROPSBASIC_HEADER_INCLUDED

-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>

 namespace Opm
 {
--- a/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
@@ -21,7 +21,7 @@
 #define OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED

 #include <opm/core/props/satfunc/SaturationPropsInterface.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/grid.h>
--- a/opm/core/simulator/initState_impl.hpp
+++ b/opm/core/simulator/initState_impl.hpp
@@ -23,7 +23,7 @@
 #include <opm/common/data/SimulationDataContainer.hpp>
 #include <opm/common/ErrorMacros.hpp>

-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridHelpers.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
--- a/opm/polymer/IncompPropertiesDefaultPolymer.hpp
+++ b/opm/polymer/IncompPropertiesDefaultPolymer.hpp
@@ -21,7 +21,7 @@
 #define OPM_INCOMPPROPERTIESDEFAULTPOLYMER_HEADER_INCLUDED

 #include <opm/core/props/IncompPropertiesBasic.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 #include <vector>
--- a/opm/polymer/SimulatorCompressiblePolymer.cpp
+++ b/opm/polymer/SimulatorCompressiblePolymer.cpp
@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H

 #include <opm/polymer/SimulatorCompressiblePolymer.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>

 #include <opm/polymer/CompressibleTpfaPolymer.hpp>
--- a/opm/polymer/SimulatorPolymer.cpp
+++ b/opm/polymer/SimulatorPolymer.cpp
@@ -23,7 +23,7 @@
 #endif // HAVE_CONFIG_H

 #include <opm/polymer/SimulatorPolymer.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>

 #include <opm/polymer/IncompTpfaPolymer.hpp>
--- a/opm/simulators/SimulatorCompressibleTwophase.cpp
+++ b/opm/simulators/SimulatorCompressibleTwophase.cpp
@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H

 #include <opm/simulators/SimulatorCompressibleTwophase.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>

 #include <opm/core/pressure/CompressibleTpfa.hpp>
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <utility>

-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/TimeStepControlInterface.hpp>
--- a/opm/simulators/timestepping/SimulatorTimer.cpp
+++ b/opm/simulators/timestepping/SimulatorTimer.cpp
@@ -19,7 +19,7 @@

 #include "config.h"
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <ostream>
 #include <numeric>