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:
Andreas Lauser 2015-05-21 16:19:13 +02:00
parent 46bd76407d
commit 2b4d70e3d9
7 changed files with 8 additions and 25 deletions

View File

@ -50,9 +50,7 @@ class FingerGridManager;
template <class TypeTag>
class FingerProblem;
} // namespace Ewoms
namespace Ewoms {
namespace Properties {
// declare the properties required by the for the finger grid manager
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, GridManager, Ewoms::FingerGridManager<TypeTag>);
}} // namespace Ewoms, Properties
} // namespace Properties
namespace Ewoms {
/*!
* \brief Helper class for grid instantiation of the finger problem.
*/

View File

@ -49,9 +49,7 @@
namespace Ewoms {
template <class TypeTag>
class FingerProblem;
}
namespace Ewoms {
namespace Properties {
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
SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
}} // namespace Ewoms, Properties
} // namespace Properties
namespace Ewoms {
/*!
* \ingroup TestProblems
*

View File

@ -25,6 +25,7 @@
#define EWOMS_FRACTURE_PROBLEM_HH
#include <ewoms/parallel/mpihelper.hh>
#include <ewoms/models/discretefracture/discretefracturemodel.hh>
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
@ -46,8 +47,6 @@
#include <opm/material/components/Dnapl.hpp>
#include <ewoms/io/artgridmanager.hh>
#include <ewoms/models/discretefracture/discretefracturemodel.hh>
#include <dune/common/version.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh>

View File

@ -41,9 +41,7 @@ class LensProblem;
template <class TypeTag>
class LensGridManager;
} // namespace Ewoms
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(LensGridManager);
@ -64,9 +62,8 @@ NEW_PROP_TAG(GridGlobalRefinements);
// set the Grid and GridManager properties
SET_TYPE_PROP(LensGridManager, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(LensGridManager, GridManager, Ewoms::LensGridManager<TypeTag>);
}} // namespace Ewoms, Properties
} // namespace Properties
namespace Ewoms {
/*!
* \ingroup TestProblems
*

View File

@ -48,9 +48,7 @@
namespace Ewoms {
template <class TypeTag>
class LensProblem;
}
namespace Ewoms {
namespace Properties {
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
SET_BOOL_PROP(LensBaseProblem, VtkWriteIntrinsicPermeabilities, true);
}} // namespace Ewoms, Properties
} // namespace Properties
namespace Ewoms {
/*!
* \ingroup TestProblems
*

View File

@ -110,9 +110,8 @@ SET_SCALAR_PROP(ReservoirBaseProblem, InitialTimeStepSize, 10);
// The default DGF file to load
SET_STRING_PROP(ReservoirBaseProblem, GridFile, "data/reservoir.dgf");
}} // namespace Properties, Opm
} // namespace Properties
namespace Ewoms {
/*!
* \ingroup TestProblems
*

View File

@ -43,9 +43,7 @@
namespace Ewoms {
template <class TypeTag>
class RichardsLensProblem;
}
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards));
@ -118,9 +116,8 @@ SET_SCALAR_PROP(RichardsLensProblem, InitialTimeStepSize, 100);
// The default DGF file to load
SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf");
}} // namespace Ewoms, Properties
} // namespace Properties
namespace Ewoms {
/*!
* \ingroup TestProblems
*
@ -331,7 +328,7 @@ public:
Scalar referencePressure(const Context &context,
int spaceIdx,
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
// where the reference pressure is required...