OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

use the infrastructural code using its new locations

Browse Source
This commit is contained in:
Andreas Lauser 2015-04-28 11:58:21 +02:00
parent 12dc2c6447
commit eba7e06bed
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/ebos/eclfluxmodule.hh
View File

@ -32,7 +32,7 @@
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
namespace Opm { namespace Ewoms {
namespace Properties { namespace Properties {
NEW_PROP_TAG(MaterialLaw); NEW_PROP_TAG(MaterialLaw);
}} }}
@ -117,7 +117,7 @@ public:
*/ */
const DimMatrix& intrinsicPermeability() const const DimMatrix& intrinsicPermeability() const
{ {
OPM_THROW(Opm::NotImplemented, OPM_THROW(Opm::NotAvailable,
"The ECL transmissibility module does not provide an explicit intrinsic permeability"); "The ECL transmissibility module does not provide an explicit intrinsic permeability");
} }
@ -129,7 +129,7 @@ public:
*/ */
const DimVector& potentialGrad(int phaseIdx) const const DimVector& potentialGrad(int phaseIdx) const
{ {
OPM_THROW(Opm::NotImplemented, OPM_THROW(Opm::NotAvailable,
"The ECL transmissibility module does not provide explicit potential gradients"); "The ECL transmissibility module does not provide explicit potential gradients");
} }
@ -141,7 +141,7 @@ public:
*/ */
const DimVector& filterVelocity(int phaseIdx) const const DimVector& filterVelocity(int phaseIdx) const
{ {
OPM_THROW(Opm::NotImplemented, OPM_THROW(Opm::NotAvailable,
"The ECL transmissibility module does not provide explicit filter velocities"); "The ECL transmissibility module does not provide explicit filter velocities");
} }

6
applications/ebos/ecloutputblackoilmodule.hh
View File

@ -27,14 +27,14 @@
#include <ewoms/io/baseoutputmodule.hh> #include <ewoms/io/baseoutputmodule.hh>
#include <opm/core/utility/PropertySystem.hpp> #include <ewoms/common/propertysystem.hh>
#include <ewoms/common/parametersystem.hh> #include <ewoms/common/parametersystem.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <type_traits> #include <type_traits>
namespace Opm { namespace Ewoms {
namespace Properties { namespace Properties {
// create new type tag for the VTK multi-phase output // create new type tag for the VTK multi-phase output
NEW_TYPE_TAG(EclOutputBlackOil); NEW_TYPE_TAG(EclOutputBlackOil);
@ -54,7 +54,7 @@ SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteGasDissolutionFactor, true);
SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteGasFormationVolumeFactor, true); SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteGasFormationVolumeFactor, true);
SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteOilFormationVolumeFactor, true); SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteOilFormationVolumeFactor, true);
SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteOilSaturationPressure, true); SET_BOOL_PROP(EclOutputBlackOil, EclOutputWriteOilSaturationPressure, true);
}} // namespace Opm, Properties }} // namespace Ewoms, Properties
namespace Ewoms { namespace Ewoms {

8
applications/ebos/eclpeacemanwell.hh
View File

@ -25,19 +25,17 @@
#define EWOMS_ECL_PEACEMAN_WELL_HH #define EWOMS_ECL_PEACEMAN_WELL_HH
#include <ewoms/aux/baseauxiliarymodule.hh> #include <ewoms/aux/baseauxiliarymodule.hh>
#include <ewoms/common/propertysystem.hh>
#include <opm/material/fluidstates/CompositionalFluidState.hpp> #include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/core/utility/PropertySystem.hpp>
#include <opm/core/utility/Average.hpp>
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/geometry/referenceelements.hh> #include <dune/geometry/referenceelements.hh>
#include <map> #include <map>
namespace Opm { namespace Ewoms {
namespace Properties { namespace Properties {
NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Scalar);
NEW_PROP_TAG(Discretization); NEW_PROP_TAG(Discretization);
@ -1326,7 +1324,7 @@ protected:
return bhp; return bhp;
} }
OPM_THROW(Opm::NumericalProblem, OPM_THROW(Opm::NumericalIssue,
"Could not determine the bottom hole pressure of well '" << name() "Could not determine the bottom hole pressure of well '" << name()
<< "' within 20 iterations."); << "' within 20 iterations.");
} }

4
applications/ebos/eclproblem.hh
View File

@ -50,8 +50,6 @@
#include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp> #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp>
#include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp> #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
#include <opm/core/utility/Average.hpp>
// for this simulator to make sense, dune-cornerpoint and opm-parser // for this simulator to make sense, dune-cornerpoint and opm-parser
// must be available // must be available
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
@ -72,7 +70,7 @@ template <class TypeTag>
class EclProblem; class EclProblem;
} }
namespace Opm { namespace Ewoms {
namespace Properties { namespace Properties {
NEW_TYPE_TAG(EclBaseProblem, INHERITS_FROM(EclGridManager, EclOutputBlackOil)); NEW_TYPE_TAG(EclBaseProblem, INHERITS_FROM(EclGridManager, EclOutputBlackOil));

4
applications/ebos/eclwellmanager.hh
View File

@ -33,7 +33,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>
#include <opm/core/utility/PropertySystem.hpp> #include <ewoms/common/propertysystem.hh>
#include <dune/grid/common/gridenums.hh> #include <dune/grid/common/gridenums.hh>
@ -41,7 +41,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
namespace Opm { namespace Ewoms {
namespace Properties { namespace Properties {
NEW_PROP_TAG(Grid); NEW_PROP_TAG(Grid);
}} }}