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

sanitize white space

Browse Source 
replace eacg tab by 4 spaces and remove the spaces at line ends. we
should do this more often!
This commit is contained in:
Andreas Lauser 2010-06-15 09:52:10 +00:00 committed by Andreas Lauser
parent f669136297
commit 54c9450f6e
3 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/tutorial_coupled.cc
View File

@ -52,7 +52,7 @@ int main(int argc, char** argv)
std::istringstream(argv[argPos++]) >> restartTime;
}
// read the the initial time step and the end time
if (argc - argPos != 2)
usage(argv[0]);
@ -87,6 +87,6 @@ int main(int argc, char** argv)
std::cerr << "Unknown exception thrown!\n";
throw;
}
return 3;
}

10
examples/tutorialproblem_coupled.hh
View File

@ -50,7 +50,7 @@ SET_PROP(TutorialProblemCoupled, Problem) /*@\label{tutorial-coupled:set-problem
// Set the grid
SET_PROP(TutorialProblemCoupled, Grid) /*@\label{tutorial-coupled:set-grid}@*/
{
{
typedef Dune::SGrid<2,2> type;
static type *create() /*@\label{tutorial-coupled:create-grid-method}@*/
{
@ -94,7 +94,7 @@ class TutorialProblemCoupled : public TwoPBoxProblem<TypeTag, /*@\label{tutorial
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
// Grid and world dimension
enum {
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
};
@ -108,7 +108,7 @@ class TutorialProblemCoupled : public TwoPBoxProblem<TypeTag, /*@\label{tutorial
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
typedef typename SolutionTypes::PrimaryVarVector PrimaryVarVector;
typedef typename SolutionTypes::BoundaryTypeVector BoundaryTypeVector;
@ -134,7 +134,7 @@ public:
const Intersection &isIt,
int scvIdx,
int boundaryFaceIdx) const
{
{
const GlobalPosition &pos = element.geometry().corner(scvIdx);
if (pos[0] < eps_) // dirichlet conditions on left boundary
BCtype.setAllDirichlet();
@ -168,7 +168,7 @@ public:
int scvIdx,
int boundaryFaceIdx) const
{
const GlobalPosition &pos =
const GlobalPosition &pos =
fvElemGeom.boundaryFace[boundaryFaceIdx].ipGlobal;
Scalar right = this->bboxMax()[0];
if (pos[0] > right - eps_) {

112
examples/tutorialspatialparameters_coupled.hh
View File

@ -29,77 +29,77 @@ namespace Dumux
template<class TypeTag>
class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@\label{tutorial-coupled:tutorialSpatialParameters}@*/
{
// Get informations for current implementation via property system
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
// Get informations for current implementation via property system
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
enum
{
dim = Grid::dimension,
dimWorld = Grid::dimensionworld,
};
enum
{
dim = Grid::dimension,
dimWorld = Grid::dimensionworld,
};
// Get object types for function arguments
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename Grid::Traits::template Codim<0>::Entity Element;
// Get object types for function arguments
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename Grid::Traits::template Codim<0>::Entity Element;
// select material law to be used
typedef LinearMaterial<Scalar> RawMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/
// select material law to be used
typedef LinearMaterial<Scalar> RawMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/
public:
// adapter for absolute law
typedef EffToAbsLaw<RawMaterialLaw> MaterialLaw; /*@\label{tutorial-coupled:eff2abs}@*/
// determine appropriate parameters depening on selected materialLaw
typedef typename MaterialLaw::Params MaterialLawParams; /*@\label{tutorial-coupled:matLawObjectType}@*/
typedef EffToAbsLaw<RawMaterialLaw> MaterialLaw; /*@\label{tutorial-coupled:eff2abs}@*/
// determine appropriate parameters depening on selected materialLaw
typedef typename MaterialLaw::Params MaterialLawParams; /*@\label{tutorial-coupled:matLawObjectType}@*/
// method returning the intrinsic permeability tensor K depending
// on the position within the domain
const Dune::FieldMatrix<Scalar, dim, dim> &intrinsicPermeability(const Element &element, /*@\label{tutorial-coupled:permeability}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return K_;
}
// method returning the intrinsic permeability tensor K depending
// on the position within the domain
const Dune::FieldMatrix<Scalar, dim, dim> &intrinsicPermeability(const Element &element, /*@\label{tutorial-coupled:permeability}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return K_;
}
// method returning the porosity of the porous matrix depending on
// the position within the domain
double porosity(const Element &element, /*@\label{tutorial-coupled:porosity}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return 0.2;
}
// method returning the porosity of the porous matrix depending on
// the position within the domain
double porosity(const Element &element, /*@\label{tutorial-coupled:porosity}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return 0.2;
}
// return the materialLaw context (i.e. BC, regularizedVG, etc) depending on the position
const MaterialLawParams& materialLawParams(const Element &element, /*@\label{tutorial-coupled:matLawParams}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return materialParams_;
}
// return the materialLaw context (i.e. BC, regularizedVG, etc) depending on the position
const MaterialLawParams& materialLawParams(const Element &element, /*@\label{tutorial-coupled:matLawParams}@*/
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return materialParams_;
}
// constructor
TutorialSpatialParametersCoupled(const GridView& gridView) :
BoxSpatialParameters<TypeTag>(gridView), K_(0)
{
for (int i = 0; i < dim; i++)
K_[i][i] = 1e-7;
// constructor
TutorialSpatialParametersCoupled(const GridView& gridView) :
BoxSpatialParameters<TypeTag>(gridView), K_(0)
{
for (int i = 0; i < dim; i++)
K_[i][i] = 1e-7;
//set residual saturations
materialParams_.setSwr(0.0); /*@\label{tutorial-coupled:setLawParams}@*/
materialParams_.setSnr(0.0);
//set residual saturations
materialParams_.setSwr(0.0); /*@\label{tutorial-coupled:setLawParams}@*/
materialParams_.setSnr(0.0);
//linear material law
materialParams_.setEntryPC(0.0);
materialParams_.setMaxPC(0.0);
}
//linear material law
materialParams_.setEntryPC(0.0);
materialParams_.setMaxPC(0.0);
}
private:
Dune::FieldMatrix<Scalar, dim, dim> K_;
// Object that helds the values/parameters of the selected material law.
MaterialLawParams materialParams_; /*@\label{tutorial-coupled:matParamsObject}@*/
Dune::FieldMatrix<Scalar, dim, dim> K_;
// Object that helds the values/parameters of the selected material law.
MaterialLawParams materialParams_; /*@\label{tutorial-coupled:matParamsObject}@*/
};
} // end namespace
#endif