Commit 75888c39 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[whitespace] Remove trailing whitespace.

parent f94a3e16
......@@ -4,7 +4,7 @@ project("dumux" C CXX)
# general stuff
cmake_minimum_required(VERSION 2.8.6)
if(NOT (dune-common_DIR
if(NOT (dune-common_DIR
OR dune-common_ROOT
OR "${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
string(REPLACE ${CMAKE_PROJECT_NAME}
......
......@@ -69,10 +69,10 @@ struct TwoPMincCommonIndices
* \tparam formulation The formulation, either pwsn or pnsw
* \tparam PVOffset The first index in a primary variable vector.
*/
template <class TypeTag,
int formulation = TwoPMincFormulation::pwsn,
template <class TypeTag,
int formulation = TwoPMincFormulation::pwsn,
int PVOffset = 0 >
struct TwoPMincIndices
struct TwoPMincIndices
: public TwoPMincCommonIndices<TypeTag>, TwoPMincFormulation
{
// Primary variable indices
......@@ -82,14 +82,14 @@ struct TwoPMincIndices
// indices of the primary variables
static const int pwIdx = PVOffset + 0; //!< index of the wetting phase pressure
static const int snIdx = PVOffset + 1; //!< index of the nonwetting phase saturation
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
static const int pIdxc(int numC) {return pwIdx + 2 *numC;} //!< index of the wetting phase pressure for continuum numC
static const int sIdxc(int numC) {return snIdx + 2 *numC;} //!< index of the non-wetting phase saturation for continuum numC
static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
};
......@@ -120,7 +120,7 @@ struct TwoPMincIndices<TypeTag, TwoPMincFormulation::pnsw, PVOffset>
static const int pIdxc(int numC) {return pnIdx + 2 *numC;} //!< index of the nonwetting phase pressure for continuum numC
static const int sIdxc(int numC) {return swIdx + 2 *numC;} //!< index of the wetting phase saturation for continuum numC
static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
};
......
......@@ -300,7 +300,7 @@ public:
* mobility is not yet included here since this would require a
* decision on the upwinding approach (which is done in the
* model and/or local residual file).
*
*
* \param phaseIdx The phase index
*/
Scalar KmvpNormal(int phaseIdx) const
......@@ -309,7 +309,7 @@ public:
/*!
* \brief Return the pressure potential multiplied with the
* intrinsic permeability as vector (for velocity output)
*
*
* \param phaseIdx The phase index
*/
DimVector Kmvp(int phaseIdx) const
......@@ -318,7 +318,7 @@ public:
/*!
* \brief Return the local index of the upstream control volume
* for a given phase.
*
*
* \param phaseIdx The phase index
*/
int upstreamIdx(int phaseIdx) const
......@@ -327,7 +327,7 @@ public:
/*!
* \brief Return the local index of the downstream control volume
* for a given phase.
*
*
* \param phaseIdx The phase index
*/
int downstreamIdx(int phaseIdx) const
......@@ -335,7 +335,7 @@ public:
/*!
* \brief The binary diffusion coefficient for each fluid phase.
*
*
* \param phaseIdx The phase index
* \param compIdx The component index
*/
......@@ -345,7 +345,7 @@ public:
/*!
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
* point.
*
*
* \param phaseIdx The phase index
*/
Scalar density(int phaseIdx) const
......@@ -354,7 +354,7 @@ public:
/*!
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
* point.
*
*
* \param phaseIdx The phase index
*/
Scalar molarDensity(int phaseIdx) const
......@@ -362,7 +362,7 @@ public:
/*!
* \brief The concentration gradient of a component in a phase.
*
*
* \param phaseIdx The phase index
* \param compIdx The component index
*/
......@@ -371,7 +371,7 @@ public:
/*!
* \brief The molar concentration gradient of a component in a phase.
*
*
* \param phaseIdx The phase index
* \param compIdx The component index
*/
......
......@@ -241,7 +241,7 @@ public:
// add advective flux of current component in current
// phase
unsigned int eqIdx = conti0EqIdx + compIdx;
if (eqIdx != replaceCompEqIdx)
{
// upstream vertex
......@@ -327,7 +327,7 @@ public:
this->fvGeometry_(),
scvIdx,
this->curVolVars_());
Valgrind::CheckDefined(source);
}
......@@ -337,7 +337,7 @@ protected:
void evalPhaseStorage_(int phaseIdx)
{
// evaluate the storage terms of a single phase
for (int i=0; i < this->fvGeometry_().numScv; i++)
for (int i=0; i < this->fvGeometry_().numScv; i++)
{
PrimaryVariables &result = this->residual_[i];
const ElementVolumeVariables &elemVolVars = this->curVolVars_();
......
......@@ -73,7 +73,7 @@ private:
public:
static const int value = FluidSystem::numComponents;
};
//! The major components belonging to the existing phases are mentioned here e.g., 2 for water and air being the major component in the liquid and gas phases in a 2 phase system
//! The major components belonging to the existing phases are mentioned here e.g., 2 for water and air being the major component in the liquid and gas phases in a 2 phase system
SET_PROP(TwoPNC, NumMajorComponents)
{
private:
......
......@@ -49,7 +49,7 @@ class TwoPNCMinFluxVariables : public TwoPNCFluxVariables<TypeTag>
{
typedef TwoPNCFluxVariables<TypeTag> ParentType;
typedef TwoPNCMinFluxVariables<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
......@@ -100,7 +100,7 @@ public:
const int fIdx,
const ElementVolumeVariables &elemVolVars,
const bool onBoundary = false)
: ParentType(problem, element, fvGeometry, fIdx, elemVolVars, onBoundary)
: ParentType(problem, element, fvGeometry, fIdx, elemVolVars, onBoundary)
{
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
this->density_[phaseIdx] = Scalar(0);
......@@ -117,7 +117,7 @@ public:
this->calculateporousDiffCoeff_(problem, element, elemVolVars);
};
protected:
protected:
void calculateVelocities_(const Problem &problem,
const Element &element,
const ElementVolumeVariables &elemVolVars)
......
......@@ -19,7 +19,7 @@
/*!
* \file
* \brief Defines the indices required for the two-phase n-component mineralization
* \brief Defines the indices required for the two-phase n-component mineralization
* fully implicit model.
*/
#ifndef DUMUX_2PNCMIN_INDICES_HH
......@@ -38,7 +38,7 @@ namespace Dumux
*/
template <class TypeTag, int PVOffset = 0>
class TwoPNCMinIndices: public TwoPNCIndices<TypeTag, PVOffset>
{
{
};
// \}
......
......@@ -44,7 +44,7 @@ class TwoPNCMinLocalResidual: public TwoPNCLocalResidual<TypeTag>
{
protected:
typedef TwoPNCLocalResidual<TypeTag> ParentType;
typedef TwoPNCMinLocalResidual<TypeTag> ThisType;
typedef TwoPNCMinLocalResidual<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
......@@ -120,7 +120,7 @@ public:
{
//call parenttype function
ParentType::computeStorage(storage, scvIdx, usePrevSol);
const ElementVolumeVariables &elemVolVars = usePrevSol ? this->prevVolVars_()
: this->curVolVars_();
const VolumeVariables &volVars = elemVolVars[scvIdx];
......
......@@ -49,8 +49,8 @@ namespace Properties {
/*!
* \brief Set the property for the number of secondary components.
* Secondary components are components calculated from
* primary components by equilibrium relations and
* Secondary components are components calculated from
* primary components by equilibrium relations and
* do not have mass balance equation on their own.
* These components are important in the context of bio-mineralization applications.
* We just forward the number from the fluid system
......@@ -81,7 +81,7 @@ public:
};
/*!
* \brief Set the property for the number of equations.
* \brief Set the property for the number of equations.
* For each component and each precipitated mineral/solid phase one equation has to
* be solved.
*/
......
......@@ -63,7 +63,7 @@ class TwoPNCMinVolumeVariables : public TwoPNCVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
enum
{
dim = GridView::dimension,
dimWorld=GridView::dimensionworld,
......@@ -107,7 +107,7 @@ class TwoPNCMinVolumeVariables : public TwoPNCVolumeVariables<TypeTag>
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
enum { dofCodim = isBox ? dim : 0 };
public:
//! The type of the object returned by the fluidState() method
typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
/*!
......@@ -144,10 +144,10 @@ public:
precipitateVolumeFraction_[sPhaseIdx] = priVars[numComponents + sPhaseIdx];
sumPrecipitates_+= precipitateVolumeFraction_[sPhaseIdx];
}
// for(int sPhaseIdx = 0; sPhaseIdx < numSPhases; ++sPhaseIdx)
// {
// Chemistry chemistry; // the non static functions can not be called without abject
// Chemistry chemistry; // the non static functions can not be called without abject
// saturationIdx_[sPhaseIdx] = chemistry.omega(sPhaseIdx);
// }
// TODO/FIXME: The salt crust porosity is not clearly defined. However form literature review it is
......@@ -312,7 +312,7 @@ public:
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
moleFrac[compIdx] = (priVars[compIdx]*fugCoeffL[compIdx]*fluidState.pressure(wPhaseIdx))
/(fugCoeffG[compIdx]*fluidState.pressure(nPhaseIdx));
moleFrac[wCompIdx] = priVars[switchIdx];
Scalar sumMoleFracNotGas = 0;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
......@@ -344,7 +344,7 @@ public:
}
else if (phasePresence == wPhaseOnly){
// only the liquid phase is present, i.e. liquid phase
// composition is stored explicitly.
// extract _mass_ fractions in the gas phase
......@@ -387,35 +387,35 @@ public:
}
}
/*!
* \brief Returns the volume fraction of the precipitate (solid phase)
* \brief Returns the volume fraction of the precipitate (solid phase)
* for the given phaseIdx
*
*
* \param phaseIdx the index of the solid phase
*/
Scalar precipitateVolumeFraction(int phaseIdx) const
{ return precipitateVolumeFraction_[phaseIdx - numPhases]; }
/*!
* \brief Returns the inital porosity of the
* \brief Returns the inital porosity of the
* pure, precipitate-free porous medium
*/
Scalar initialPorosity() const
{ return initialPorosity_;}
/*!
* \brief Returns the inital permeability of the
* \brief Returns the inital permeability of the
* pure, precipitate-free porous medium
*/
Scalar initialPermeability() const
{ return initialPermeability_;}
/*!
* \brief Returns the factor for the reduction of the initial permeability
* \brief Returns the factor for the reduction of the initial permeability
* due precipitates in the porous medium
*/
Scalar permeabilityFactor() const
{ return permeabilityFactor_; }
/*!
* \brief Returns the mole fraction of a component in the phase
*
......@@ -426,7 +426,7 @@ public:
{
return this->fluidState_.moleFraction(phaseIdx, compIdx);
}
/*!
* \brief Returns the mole fraction of the salinity in the liquid phase
*/
......@@ -434,7 +434,7 @@ public:
{
return moleFractionSalinity_;
}
/*!
* \brief Returns the salinity (mass fraction) in the liquid phase
*/
......@@ -442,12 +442,12 @@ public:
{
return salinity_;
}
/*!
* \brief Returns the density of the phase for all fluid and solid phases
*
* \brief Returns the density of the phase for all fluid and solid phases
*
* \param phaseIdx the index of the fluid phase
*/
*/
Scalar density(int phaseIdx) const
{
if (phaseIdx < numPhases)
......@@ -472,13 +472,13 @@ public:
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
/*!
* \brief Returns the molality of a component in the phase
*
*
* \param phaseIdx the index of the fluid phase
* \param compIdx the index of the component
*/
*/
Scalar molality(int phaseIdx, int compIdx) const // [moles/Kg]
{ return this->fluidState_.moleFraction(phaseIdx, compIdx)/FluidSystem::molarMass(compIdx);}
......@@ -492,7 +492,7 @@ protected:
{
return problem.temperatureAtPos(fvGeometry.subContVol[scvIdx].global);
}
template<class ParameterCache>
static Scalar enthalpy_(const FluidState& fluidState,
const ParameterCache& paramCache,
......
......@@ -39,7 +39,7 @@ namespace Dumux
namespace Properties
{
// forward declaration of properties
// forward declaration of properties
NEW_PROP_TAG(ImplicitMobilityUpwindWeight);
NEW_PROP_TAG(SpatialParams);
NEW_PROP_TAG(NumPhases);
......@@ -48,7 +48,7 @@ NEW_PROP_TAG(ProblemEnableGravity);
/*!
* \ingroup ImplicitFluxVariables
* \brief Evaluates the normal component of the Darcy velocity
* \brief Evaluates the normal component of the Darcy velocity
* on a (sub)control volume face.
*/
template <class TypeTag>
......@@ -58,7 +58,7 @@ class CpDarcyFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -131,7 +131,7 @@ public:
*/
const unsigned int downstreamIdx(const unsigned phaseIdx) const
{ return downstreamIdx_[phaseIdx]; }
/*!
* \brief Return the local index of the upstream control volume
* for a given phase.
......
......@@ -94,11 +94,11 @@ public:
// only treat boundary if current solution is evaluated
if (!oldSol)
{
// check if element intersects with the boundary
// check if element intersects with the boundary
ElementBoundaryTypes elemBCTypes;
elemBCTypes.update(problem, element);
if (elemBCTypes.hasDirichlet()
|| elemBCTypes.hasNeumann()
if (elemBCTypes.hasDirichlet()
|| elemBCTypes.hasNeumann()
|| elemBCTypes.hasOutflow())
{
const int numFaces = 6;
......@@ -127,7 +127,7 @@ public:
/*scvIdx=*/0,
oldSol);
}
else
else
{
(*this)[indexInVariables] = (*this)[0];
}
......
......@@ -91,7 +91,7 @@ public:
SubControlVolumeFace subContVolFace[maxNE]; //!< data of the sub control volume faces
BoundaryFace boundaryFace[maxBF]; //!< data of the boundary faces
int numScv; //!< number of subcontrol volumes
int numScvf; //!< number of inner-domain subcontrolvolume faces
int numScvf; //!< number of inner-domain subcontrolvolume faces
int numNeighbors; //!< number of neighboring elements including the element itself
std::vector<Element> neighbors; //!< stores the neighboring elements
......@@ -111,7 +111,7 @@ public:
subContVol[0].inner = true;
subContVol[0].volume = elementVolume;
// initialize neighbors list with self:
// initialize neighbors list with self:
numNeighbors = 1;
neighbors.clear();
neighbors.reserve(maxNE);
......
......@@ -83,7 +83,7 @@ public:
/*!
* \brief Returns a reference to the input deck.
*
*
* The input deck can be used to read parameters like porosity/permeability.
*/
static Opm::DeckConstPtr &deck()
......
......@@ -76,7 +76,7 @@ public:
* Himmelblau by the temperature.
* \param temperature The temperature \f$\mathrm{[K]}\f$
* \param pressure The pressure \f$\mathrm{[Pa]}\f$
*
*
* See:
*
* R. Reid et al.: "The properties of Gases and Liquids", 4th edition,
......@@ -112,10 +112,10 @@ public:
* \param xlNaCl the xlNaCl
*/
static void calculateMoleFractions(const Scalar temperature,
const Scalar pg,
const Scalar pg,
const Scalar XlNaCl,
const int knownPhaseIdx,
Scalar &xlAir,
Scalar &xlAir,
Scalar &ygH2O,
Scalar &xlNaCl) {
DUNE_THROW(Dune::InvalidStateException, "Function: " << "calculateMoleFractions" << " is invalid.");
......
......@@ -56,7 +56,7 @@ public:
return henryIAPWS(E, F, G, H, temperature);
};
/*!
* \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular water and nitrogen.
*
......
......@@ -125,7 +125,7 @@ public:
* Equations given in: - Palliser & McKibbin 1997
* - Michaelides 1981
* - Daubert & Danner 1989
*
*
*/
static const Scalar liquidEnthalpy(Scalar T,
Scalar p, Scalar salinity)
......@@ -314,7 +314,7 @@ public:
* \param temperature temperature of component in \f$\mathrm{[K]}\f$
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
* \param salinity The mass fraction of salt
*
*
* Equation given in: - Batzle & Wang (1992)
* - cited by: Bachu & Adams (2002)
* "Equations of State for basin geofluids"
......@@ -330,7 +330,7 @@ public:
Scalar A = (0.42*pow((pow(salinity, 0.8)-0.17), 2) + 0.045)*pow(T_C, 0.8);
Scalar mu_brine = 0.1 + 0.333*salinity + (1.65+91.9*salinity*salinity*salinity)*exp(-A);
assert(mu_brine > 0.0);
return mu_brine/1000.0;
return mu_brine/1000.0;
}
};
} // end namespace
......
......@@ -46,24 +46,24 @@ public:
* \brief A human readable name for the NaCl.
*/
static const char *name()
{
return "NaCl";
{
return "NaCl";
}
/*!
* \brief The molar mass of NaCl in \f$\mathrm{[kg/mol]}\f$.
*/
static Scalar molarMass()
{
return 58.4428e-3 ;
{
return 58.4428e-3 ;
}
/*!
* \brief The diffusion Coefficient \f$\mathrm{[m^2/s]}\f$ of NaCl in water.
*/
static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
{
return 2e-9;
{
return 2e-9;
}
/*!
......@@ -78,4 +78,4 @@ public:
} // end namespace
#endif
......@@ -40,9 +40,9 @@ namespace Dumux {
template <class Scalar, class FluidSystem>
class compositionFromFugacities2pncmin
{
enum {
enum {
numComponents = FluidSystem::numComponents,
numMajorComponents = FluidSystem::numMajorComponents
numMajorComponents = FluidSystem::numMajorComponents
};
typedef typename FluidSystem::ParameterCache ParameterCache;
......@@ -55,8 +55,8 @@ public:
* \brief Guess an initial value for the composition of the phase.
* \param fluidState Thermodynamic state of the fluids
* \param paramCache Container for cache parameters
* \param phaseIdx The phase index
* \param phasePresence The presence index of the reference phase
* \param phaseIdx The phase index
* \param phasePresence The presence index of the reference phase
* \param fugVec fugacity vector of the component
*/
template <class FluidState>
......@@ -70,7 +70,7 @@ public:
return;
// Pure component fugacities
for (int i = 0; i < numComponents; ++ i)
for (int i = 0; i < numComponents; ++ i)
{
fluidState.setMoleFraction(phaseIdx,i, 1.0/numComponents);
}
......@@ -78,10 +78,10 @@ public: