mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
some minor fixes
i.e., removing redundant namespace open- and closings due to the fact that the property system now resides in the 'Ewoms' namspace instead of in 'Opm', and making the headercheck work for all headers.
This commit is contained in:
@@ -50,9 +50,7 @@ class FingerGridManager;
|
|||||||
|
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
class FingerProblem;
|
class FingerProblem;
|
||||||
} // namespace Ewoms
|
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
// declare the properties required by the for the finger grid manager
|
// declare the properties required by the for the finger grid manager
|
||||||
NEW_TYPE_TAG(FingerGridManager);
|
NEW_TYPE_TAG(FingerGridManager);
|
||||||
@@ -73,9 +71,8 @@ NEW_PROP_TAG(GridGlobalRefinements);
|
|||||||
SET_TYPE_PROP(FingerGridManager, Grid, Dune::ALUGrid<FINGER_DIM, FINGER_DIM, Dune::cube, Dune::nonconforming>);
|
SET_TYPE_PROP(FingerGridManager, Grid, Dune::ALUGrid<FINGER_DIM, FINGER_DIM, Dune::cube, Dune::nonconforming>);
|
||||||
SET_TYPE_PROP(FingerGridManager, GridManager, Ewoms::FingerGridManager<TypeTag>);
|
SET_TYPE_PROP(FingerGridManager, GridManager, Ewoms::FingerGridManager<TypeTag>);
|
||||||
|
|
||||||
}} // namespace Ewoms, Properties
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Helper class for grid instantiation of the finger problem.
|
* \brief Helper class for grid instantiation of the finger problem.
|
||||||
*/
|
*/
|
||||||
|
@@ -49,9 +49,7 @@
|
|||||||
namespace Ewoms {
|
namespace Ewoms {
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
class FingerProblem;
|
class FingerProblem;
|
||||||
}
|
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
NEW_TYPE_TAG(FingerBaseProblem, INHERITS_FROM(FingerGridManager));
|
NEW_TYPE_TAG(FingerBaseProblem, INHERITS_FROM(FingerGridManager));
|
||||||
|
|
||||||
@@ -123,9 +121,8 @@ SET_SCALAR_PROP(FingerBaseProblem, EndTime, 215);
|
|||||||
|
|
||||||
// The default for the initial time step size of the simulation
|
// The default for the initial time step size of the simulation
|
||||||
SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
|
SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
|
||||||
}} // namespace Ewoms, Properties
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \ingroup TestProblems
|
* \ingroup TestProblems
|
||||||
*
|
*
|
||||||
|
@@ -25,6 +25,7 @@
|
|||||||
#define EWOMS_FRACTURE_PROBLEM_HH
|
#define EWOMS_FRACTURE_PROBLEM_HH
|
||||||
|
|
||||||
#include <ewoms/parallel/mpihelper.hh>
|
#include <ewoms/parallel/mpihelper.hh>
|
||||||
|
#include <ewoms/models/discretefracture/discretefracturemodel.hh>
|
||||||
|
|
||||||
#if HAVE_DUNE_ALUGRID
|
#if HAVE_DUNE_ALUGRID
|
||||||
#include <dune/alugrid/grid.hh>
|
#include <dune/alugrid/grid.hh>
|
||||||
@@ -46,8 +47,6 @@
|
|||||||
#include <opm/material/components/Dnapl.hpp>
|
#include <opm/material/components/Dnapl.hpp>
|
||||||
#include <ewoms/io/artgridmanager.hh>
|
#include <ewoms/io/artgridmanager.hh>
|
||||||
|
|
||||||
#include <ewoms/models/discretefracture/discretefracturemodel.hh>
|
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
#include <dune/common/version.hh>
|
||||||
#include <dune/common/fmatrix.hh>
|
#include <dune/common/fmatrix.hh>
|
||||||
#include <dune/common/fvector.hh>
|
#include <dune/common/fvector.hh>
|
||||||
|
@@ -41,9 +41,7 @@ class LensProblem;
|
|||||||
|
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
class LensGridManager;
|
class LensGridManager;
|
||||||
} // namespace Ewoms
|
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
NEW_TYPE_TAG(LensGridManager);
|
NEW_TYPE_TAG(LensGridManager);
|
||||||
|
|
||||||
@@ -64,9 +62,8 @@ NEW_PROP_TAG(GridGlobalRefinements);
|
|||||||
// set the Grid and GridManager properties
|
// set the Grid and GridManager properties
|
||||||
SET_TYPE_PROP(LensGridManager, Grid, Dune::YaspGrid<2>);
|
SET_TYPE_PROP(LensGridManager, Grid, Dune::YaspGrid<2>);
|
||||||
SET_TYPE_PROP(LensGridManager, GridManager, Ewoms::LensGridManager<TypeTag>);
|
SET_TYPE_PROP(LensGridManager, GridManager, Ewoms::LensGridManager<TypeTag>);
|
||||||
}} // namespace Ewoms, Properties
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \ingroup TestProblems
|
* \ingroup TestProblems
|
||||||
*
|
*
|
||||||
|
@@ -48,9 +48,7 @@
|
|||||||
namespace Ewoms {
|
namespace Ewoms {
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
class LensProblem;
|
class LensProblem;
|
||||||
}
|
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
NEW_TYPE_TAG(LensBaseProblem, INHERITS_FROM(LensGridManager));
|
NEW_TYPE_TAG(LensBaseProblem, INHERITS_FROM(LensGridManager));
|
||||||
|
|
||||||
@@ -140,9 +138,8 @@ SET_SCALAR_PROP(LensBaseProblem, InitialTimeStepSize, 250);
|
|||||||
|
|
||||||
// By default, include the intrinsic permeability tensor to the VTK output files
|
// By default, include the intrinsic permeability tensor to the VTK output files
|
||||||
SET_BOOL_PROP(LensBaseProblem, VtkWriteIntrinsicPermeabilities, true);
|
SET_BOOL_PROP(LensBaseProblem, VtkWriteIntrinsicPermeabilities, true);
|
||||||
}} // namespace Ewoms, Properties
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \ingroup TestProblems
|
* \ingroup TestProblems
|
||||||
*
|
*
|
||||||
|
@@ -110,9 +110,8 @@ SET_SCALAR_PROP(ReservoirBaseProblem, InitialTimeStepSize, 10);
|
|||||||
|
|
||||||
// The default DGF file to load
|
// The default DGF file to load
|
||||||
SET_STRING_PROP(ReservoirBaseProblem, GridFile, "data/reservoir.dgf");
|
SET_STRING_PROP(ReservoirBaseProblem, GridFile, "data/reservoir.dgf");
|
||||||
}} // namespace Properties, Opm
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \ingroup TestProblems
|
* \ingroup TestProblems
|
||||||
*
|
*
|
||||||
|
@@ -43,9 +43,7 @@
|
|||||||
namespace Ewoms {
|
namespace Ewoms {
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
class RichardsLensProblem;
|
class RichardsLensProblem;
|
||||||
}
|
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards));
|
NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards));
|
||||||
|
|
||||||
@@ -118,9 +116,8 @@ SET_SCALAR_PROP(RichardsLensProblem, InitialTimeStepSize, 100);
|
|||||||
|
|
||||||
// The default DGF file to load
|
// The default DGF file to load
|
||||||
SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf");
|
SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf");
|
||||||
}} // namespace Ewoms, Properties
|
} // namespace Properties
|
||||||
|
|
||||||
namespace Ewoms {
|
|
||||||
/*!
|
/*!
|
||||||
* \ingroup TestProblems
|
* \ingroup TestProblems
|
||||||
*
|
*
|
||||||
@@ -331,7 +328,7 @@ public:
|
|||||||
Scalar referencePressure(const Context &context,
|
Scalar referencePressure(const Context &context,
|
||||||
int spaceIdx,
|
int spaceIdx,
|
||||||
int timeIdx) const
|
int timeIdx) const
|
||||||
{ return referencePressure(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); };
|
{ return referencePressure(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); }
|
||||||
|
|
||||||
// the Richards model does not have an element context available at all places
|
// the Richards model does not have an element context available at all places
|
||||||
// where the reference pressure is required...
|
// where the reference pressure is required...
|
||||||
|
Reference in New Issue
Block a user