Commit e8efe2fb authored by Andreas Lauser's avatar Andreas Lauser
Browse files

remove trailing white space from all lines

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6816 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 6c8aa186
......@@ -382,7 +382,7 @@ public:
coordinate=globalPos[0];
boundaryIndex=0;
}
for (int segmentCount=0; segmentCount<boundaryConditions_[boundaryIndex].size();segmentCount++)
{
if ((boundaryConditions_[boundaryIndex][segmentCount].from < coordinate) &&
......@@ -398,7 +398,7 @@ public:
void writeOutput()
{
Dune::FieldVector<int,2> resolution = Params::tree().template get<Dune::FieldVector<int,2> >("Geometry.numberOfCells");
Scalar zmax, zmin;
zmax=this->variables().pressure()[0]/(Fluid::density(0,0)*9.81);
zmin=this->variables().pressure()[0]/(Fluid::density(0,0)*9.81);
......@@ -407,7 +407,7 @@ public:
{
Scalar currentHead= this->variables().pressure()[i]/(Fluid::density(0,0)*9.81);
zmax = std::max(currentHead,zmax);
zmin = std::min(currentHead,zmin);
zmin = std::min(currentHead,zmin);
}
std::ofstream dataFile;
......@@ -446,7 +446,7 @@ public:
//Textoutput:
std::cout << " x y h v_x v_y"<<std::endl;
std::cout << "------------------------------------------------------------"<<std::endl;
ElementIterator eItEnd = this->gridView().template end<0> ();
for (ElementIterator eIt = this->gridView().template begin<0> (); eIt != eItEnd; ++eIt)
{
......
......@@ -176,7 +176,7 @@ private:
Scalar rhoI = elemVolVars[face().i].density();
Scalar rhoJ = elemVolVars[face().j].density();
Scalar density = (rhoI + rhoJ)/2;
// make it a force
Vector f(g);
f *= density;
......
......@@ -95,7 +95,7 @@ public:
const FVElementGeometry fvGeom,
int scvIdx) const
{ return asImp_().temperatureAtPos(fvGeom.subContVol[scvIdx].global); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
*
......
......@@ -287,7 +287,7 @@ protected:
ScalarGradient Kmvp;
K_.mv(potentialGrad_, Kmvp);
KmvpNormal_ = 0;
for (int i = 0; i < dim; ++i)
for (int i = 0; i < dim; ++i)
KmvpNormal_ += Kmvp[i]*boundaryFace_->normal[i];
KmvpNormal_ *= -1;
......
......@@ -63,7 +63,7 @@ class OnePTwoCFluxVariables
enum { dim = GridView::dimension };
enum { dimWorld = GridView::dimensionworld };
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
......@@ -363,7 +363,7 @@ protected:
// make it a force
f *= density;
// calculate the final potential gradient
potentialGrad_ -= f;
}
......
......@@ -263,7 +263,7 @@ public:
tmp += fluxVars.moleFracGrad(comp1Idx)[i]*fluxVars.face().normal[i];
tmp *= -1;
tmp *= fluxVars.porousDiffCoeff() * fluxVars.molarDensityAtIP();
// dispersive flux of second component - molefraction
// Vector normalDisp;
// fluxVars.dispersionTensor().mv(fluxVars.face().normal, normalDisp);
......
......@@ -56,7 +56,7 @@ class OnePTwoCBoxProblem : public BoxProblem<TypeTag>
dim = GridView::dimension,
dimWorld = GridView::dimensionworld
};
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dim> Vector;
......@@ -98,7 +98,7 @@ public:
const FVElementGeometry fvGeom,
int scvIdx) const
{ return asImp_().temperatureAtPos(fvGeom.subContVol[scvIdx].global); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
*
......
......@@ -74,7 +74,7 @@ public:
phasePressure_[nPhaseIdx] = pressN;
temperature_ = temperature;
paramCache.updateAll(*this);
density_[wPhaseIdx] = FluidSystem::density(*this, paramCache, wPhaseIdx);
density_[nPhaseIdx] = FluidSystem::density(*this, paramCache, nPhaseIdx);
}
......
......@@ -202,11 +202,11 @@ private:
// both cells!
fI = fJ = 0.5;
Scalar density = (fI*rhoI + fJ*rhoJ)/(fI + fJ);
// make gravity acceleration a force
Vector f(g);
f *= density;
// calculate the final potential gradient
potentialGrad_[phaseIdx] -= f;
}
......
......@@ -207,7 +207,7 @@ public:
(*cellNum)[globalIdx] += 1;
}
};
if(velocityOutput)
{
// calculate vertex velocities
......@@ -223,14 +223,14 @@ public:
scvVelocityW = 0;
scvVelocityN = 0;
ElementVolumeVariables elemVolVars;
elemVolVars.update(this->problem_(),
*elemIt,
fvElemGeom,
false /* oldSol? */);
for (int faceIdx = 0; faceIdx< fvElemGeom.numEdges; faceIdx++)
{
......@@ -296,7 +296,7 @@ public:
}
}
typedef Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
const Dune::FieldVector<Scalar, dim> &localPos
const Dune::FieldVector<Scalar, dim> &localPos
= ReferenceElements::general(elemIt->geometry().type()).position(0, 0);
// get the transposed Jacobian of the element mapping
......
......@@ -127,7 +127,7 @@ public:
const FVElementGeometry fvGeom,
int scvIdx) const
{ return asImp_().temperatureAtPos(fvGeom.subContVol[scvIdx].global); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
*
......
......@@ -77,16 +77,16 @@ SET_TYPE_PROP(BoxTwoP, FluxVariables, TwoPFluxVariables<TypeTag>);
SET_SCALAR_PROP(BoxTwoP, MassUpwindWeight, 1.0);
//! The indices required by the isothermal 2p model
SET_TYPE_PROP(BoxTwoP,
TwoPIndices,
SET_TYPE_PROP(BoxTwoP,
TwoPIndices,
TwoPIndices<GET_PROP_VALUE(TypeTag, PTAG(Formulation)), 0>);
/*!
* \brief Set the property for the material parameters by extracting
* it from the material law.
*/
SET_TYPE_PROP(BoxTwoP,
MaterialLawParams,
SET_TYPE_PROP(BoxTwoP,
MaterialLawParams,
typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw))::Params);
SET_PROP(BoxTwoP, WettingPhase)
......@@ -110,7 +110,7 @@ SET_PROP(BoxTwoP, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonWettingPhase)) NonWettingPhase;
public:
typedef Dumux::TwoPImmiscibleFluidSystem<Scalar,
typedef Dumux::TwoPImmiscibleFluidSystem<Scalar,
WettingPhase,
NonWettingPhase> type;
};
......
......@@ -132,7 +132,7 @@ public:
typename FluidSystem::ParameterCache paramCache;
fluidState_.update(paramCache, Sn, p[wPhaseIdx], p[nPhaseIdx], temperature_);
mobility_[wPhaseIdx] =
MaterialLaw::krw(materialParams, 1 - Sn)
/
......
......@@ -182,11 +182,11 @@ private:
// both cells!
fI = fJ = 0.5;
Scalar density = (fI*rhoI + fJ*rhoJ)/(fI + fJ);
// make gravity acceleration a force
Vector f(g);
f *= density;
// calculate the final potential gradient
potentialGrad_[phaseIdx] -= f;
}
......
......@@ -311,7 +311,7 @@ public:
for (int i = 0; i < dim; ++i)
tmp += vars.molarConcGrad(lPhaseIdx)[i] * vars.face().normal[i];
tmp *= -1;
tmp *=
tmp *=
vars.porousDiffCoeff(lPhaseIdx) *
vars.molarDensityAtIP(lPhaseIdx);
// add the diffusive fluxes only to the component mass balance
......@@ -325,7 +325,7 @@ public:
for (int i = 0; i < dim; ++i)
tmp += vars.molarConcGrad(gPhaseIdx)[i] * vars.face().normal[i];
tmp *= -1;
tmp *=
tmp *=
vars.porousDiffCoeff(gPhaseIdx) *
vars.molarDensityAtIP(gPhaseIdx);
// add the diffusive fluxes only to the component mass balance
......
......@@ -399,14 +399,14 @@ public:
scvVelocityL = 0;
scvVelocityG = 0;
ElementVolumeVariables elemVolVars;
elemVolVars.update(this->problem_(),
*elemIt,
fvElemGeom,
false /* oldSol? */);
for (int faceIdx = 0; faceIdx< fvElemGeom.numEdges; faceIdx++)
{
......@@ -466,7 +466,7 @@ public:
}
typedef Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
const Dune::FieldVector<Scalar, dim>& localPos =
const Dune::FieldVector<Scalar, dim>& localPos =
ReferenceElements::general(elemIt->geometry().type()).position(0, 0);
// get the transposed Jacobian of the element mapping
......
......@@ -96,7 +96,7 @@ public:
const FVElementGeometry fvGeom,
int scvIdx) const
{ return asImp_().temperatureAtPos(fvGeom.subContVol[scvIdx].global); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
*
......
......@@ -152,9 +152,9 @@ public:
* \param phaseIdx The phase index
*/
Scalar enthalpy(int phaseIdx) const
{
{
return internalEnergy_[phaseIdx]
+ this->fluidState().pressure(phaseIdx)
+ this->fluidState().pressure(phaseIdx)
/ this->fluidState().density(phaseIdx); };
/*!
......
......@@ -108,7 +108,7 @@ public:
diffusionDat_.update(problem, element, elemGeom, scvfIdx, elemVolVars);
extrusionFactor_ =
(elemVolVars[face().i].extrusionFactor()
(elemVolVars[face().i].extrusionFactor()
+ elemVolVars[face().j].extrusionFactor()) / 2;
}
......@@ -266,11 +266,11 @@ private:
// both cells!
fI = fJ = 0.5;
Scalar density = (fI*rhoI + fJ*rhoJ)/(fI + fJ);
// make gravity acceleration a force
Vector f(g);
f *= density;
// calculate the final potential gradient
potentialGrad_[phaseIdx] -= f;
}
......
......@@ -193,7 +193,7 @@ class MPNCNewtonController : public NewtonController<TypeTag>
public:
MPNCNewtonController(const Problem &problem)
: ParentType(problem)
{
{
enableChop_ = GET_PARAM(TypeTag, bool, Newton, EnableChop);
Dune::FMatrixPrecision<>::set_singular_limit(1e-35);
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment