OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

adapt to the move of code from opm-common to opm-material

Browse Source
This commit is contained in:
Andreas Lauser 2018-02-01 14:40:01 +01:00
parent 23910186f8
commit e5344a2add
15 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/art2dgf.cpp
View File

@ -20,8 +20,7 @@
module for the precise wording of the license and the list of
copyright holders.
*/
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/Exceptions.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/version.hh>
#include <dune/common/fvector.hh>
@ -60,9 +59,8 @@ namespace Ewoms {
std::vector<std::vector<unsigned> > elements;
std::ifstream inStream(artFileName);
if (!inStream.is_open()) {
OPM_THROW(std::runtime_error,
"File '" << artFileName
<< "' does not exist or is not readable");
throw std::runtime_error("File '"+artFileName
+"' does not exist or is not readable");
}
std::string curLine;
ParseMode curParseMode = Vertex;

2
examples/problems/co2injectionproblem.hh
View File

@ -44,7 +44,7 @@
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/binarycoefficients/Brine_CO2.hpp>
#include <opm/material/common/UniformTabulated2DFunction.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

4
examples/problems/cuvetteproblem.hh
View File

@ -39,8 +39,8 @@
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/common/Valgrind.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/diffusionproblem.hh
View File

@ -37,7 +37,7 @@
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/common/version.hh>

2
examples/problems/fractureproblem.hh
View File

@ -50,7 +50,7 @@
#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Dnapl.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/version.hh>
#include <dune/common/fmatrix.hh>

2
examples/problems/groundwaterproblem.hh
View File

@ -34,7 +34,7 @@
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/fluidsystems/LiquidPhase.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

4
examples/problems/infiltrationproblem.hh
View File

@ -34,8 +34,8 @@
#include <opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/common/Valgrind.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/lensproblem.hh
View File

@ -40,7 +40,7 @@
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Dnapl.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/version.hh>
#include <dune/common/fvector.hh>

2
examples/problems/obstacleproblem.hh
View File

@ -39,7 +39,7 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/outflowproblem.hh
View File

@ -31,7 +31,7 @@
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/powerinjectionproblem.hh
View File

@ -39,7 +39,7 @@
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Air.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>

2
examples/problems/reservoirproblem.hh
View File

@ -38,7 +38,7 @@
#include <opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp>
#include <opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp>
#include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/richardslensproblem.hh
View File

@ -36,7 +36,7 @@
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
examples/problems/waterairproblem.hh
View File

@ -41,7 +41,7 @@
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>

2
tests/models/test_quadrature.cpp
View File

@ -41,7 +41,7 @@
#include <ewoms/disc/vcfv/vcfvstencil.hh>
#include <opm/common/Unused.hpp>
#include <opm/material/common/Unused.hpp>
#if HAVE_DUNE_ALUGRID
#define EWOMS_NO_ALUGRID_UNUSED