Commit 4c943b59 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove warning-causing semicolons

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7279 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e4902e00
......@@ -234,6 +234,6 @@ public:
};
};
};
}
#endif // DUMUX_MPNC_DIFFUSION_FLUX_VARIABLES_HH
......@@ -88,7 +88,7 @@ public:
}
}
Valgrind::CheckDefined(diffCoeffG_);
};
}
Scalar diffCoeff(int phaseIdx, int compIIdx, int compJIdx) const
......@@ -102,7 +102,7 @@ public:
if (i != 0)
return 0;
return diffCoeffL_[j];
};
}
/*!
* \brief If running under valgrind this produces an error message
......@@ -142,13 +142,13 @@ public:
ParameterCache &paramCache,
const VolumeVariables &volVars,
const Problem &problem)
{ };
{ }
Scalar diffCoeffL(int compIdx) const
{ return 0; };
{ return 0; }
Scalar diffCoeffG(int compIIdx, int compJIdx) const
{ return 0; };
{ return 0; }
/*!
* \brief If running under valgrind this produces an error message
......
......@@ -61,7 +61,7 @@ public:
const VolumeVariables &volVars)
{
// do nothing, we're isothermal!
};
}
static void addPhaseStorage(PrimaryVariables &storage,
......@@ -69,7 +69,7 @@ public:
int phaseIdx)
{
// do nothing, we're isothermal!
};
}
static void phaseEnthalpyFlux(PrimaryVariables &result,
int phaseIdx,
......@@ -78,14 +78,14 @@ public:
const FluxVariables &fluxVars)
{
// do nothing, we're isothermal!
};
}
static void heatConduction(PrimaryVariables &result,
const ElementVolumeVariables &volVars,
const FluxVariables &fluxVars)
{
// do nothing, we're isothermal!
};
}
static void computeFlux(PrimaryVariables & flux,
......@@ -233,6 +233,6 @@ public:
};
}
#endif // DUMUX_MPNC_ENERGY_HH
......@@ -169,6 +169,6 @@ private:
Scalar massUpwindWeight_;
};
};
}
#endif
......@@ -63,7 +63,7 @@ NEW_PROP_TAG(NonwettingPhase); //!< Fluid which represents the non-wetting phase
NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG(MassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
// \}
};
}
} // end namepace
......
......@@ -148,7 +148,7 @@ public:
};
// \}
};
}
} // end namepace
......
......@@ -325,7 +325,7 @@ protected:
destX[i] = srcX[idx];
destY[i] = srcY[idx];
}
};
}
template <class DestVector, class ListIterator>
void assignFromArrayList_(DestVector &destX,
......@@ -352,7 +352,7 @@ protected:
destX[i] = (*it)[0];
destY[i] = (*it)[1];
}
};
}
/*!
* \brief Set the sampling points.
......@@ -389,7 +389,7 @@ protected:
destX[i] = std::tr1::get<0>(*it);
destY[i] = std::tr1::get<1>(*it);
}
};
}
/*!
......@@ -587,7 +587,7 @@ protected:
x0 = (x0 + x1)/2; // pick point in the middle of the interval
// to avoid extrema on the boundaries
return (x0*(x0*3*a + 2*b) + c > 0) ? 1 : -1;
};
}
/*!
* \brief Find all the intersections of a segment of the spline
......@@ -633,7 +633,7 @@ protected:
iLow = i;
};
return iLow;
};
}
/*!
* \brief Returns x[i] - x[i - 1]
......@@ -642,7 +642,8 @@ protected:
{
assert(x_(i) > x_(i-1)); // the sampling points must be given
// in ascending order
return x_(i) - x_(i - 1); }
return x_(i) - x_(i - 1);
}
/*!
* \brief Returns the y coordinate of the i-th sampling point.
......
......@@ -314,7 +314,6 @@ private:
EvalCflFluxFunction* evalCflFluxFunction_;
static const bool compressibility_ = GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility));
;
static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
......
......@@ -78,7 +78,7 @@ public:
gv.communicate(*this,
Dune::InteriorBorder_All_Interface,
Dune::BackwardCommunication);
};
}
// data handle methods
bool contains (int dim, int codim) const
......@@ -89,14 +89,14 @@ public:
template<class EntityType>
size_t size(const EntityType &e) const
{ return 2; };
{ return 2; }
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
buff.write(gv_.comm().rank());
buff.write(map_.map(e));
};
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
......@@ -122,7 +122,7 @@ public:
// intersecting with us.
foreignBorderList_.push_back(bIdx);
}
};
}
// Access to the initial border list.
const BorderList &foreignBorderList() const
......
......@@ -59,7 +59,7 @@ public:
const Scalar H = -29.4396;
return henryIAPWS(E, F, G, H, temperature);
};
}
/*!
* \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular water and nitrogen.
......@@ -80,7 +80,7 @@ public:
const Scalar M[2] = { H2O::molarMass()*Scalar(1e3), N2::molarMass()*Scalar(1e3) };
return fullerMethod(M, SigmaNu, temperature, pressure);
};
}
/*!
* \brief Diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular nitrogen in liquid water.
......@@ -107,7 +107,7 @@ public:
const Scalar Dexp = 2.01e-9; // [m^2/s]
return Dexp * temperature/Texp;
};
}
};
}
......
......@@ -81,7 +81,7 @@ inline Scalar henryIAPWS(Scalar E,
// multiply it with the vapor pressure of water in order to get
// derivative of the partial pressure.
return exp(exponent)*H2O::vaporPressure(temperature);
};
};
}
}
#endif // DUMUX_HENRY_IAPWS_HH
......@@ -70,7 +70,7 @@ public:
i,
1.0/numComponents);
}
};
}
/*!
* \brief Calculates the chemical equilibrium from the component
......@@ -97,7 +97,7 @@ public:
Dune::FieldVector<Scalar, numComponents> xInit;
for (int i = 0; i < numComponents; ++i) {
xInit[i] = fluidState.moleFraction(phaseIdx, i);
};
}
/////////////////////////
// Newton method
......@@ -176,7 +176,7 @@ public:
<< xInit
<< "}, {fug_t} = {" << targetFug << "}, p = " << fluidState.pressure(phaseIdx)
<< ", T = " << fluidState.temperature(phaseIdx));
};
}
protected:
......@@ -204,7 +204,7 @@ protected:
Scalar rho = FluidSystem::density(fluidState, paramCache, phaseIdx);
fluidState.setDensity(phaseIdx, rho);
return;
};
}
template <class FluidState>
static void linearize_(Dune::FieldMatrix<Scalar, numComponents, numComponents> &J,
......@@ -294,7 +294,7 @@ protected:
sumx += std::abs(fluidState.moleFraction(phaseIdx, i));
sumDelta += std::abs(x[i]);
};
}
#if 1
// chop update to at most 20% change in composition
......
......@@ -169,7 +169,7 @@ public:
paramCache,
phaseIdx));
}
};
}
};
} // end namespace Dumux
......
......@@ -190,7 +190,7 @@ public:
fluidState.setEnthalpy(phaseIdx, value);
}
}
};
}
};
} // end namespace Dumux
......
......@@ -126,7 +126,7 @@ public:
fluidState.setFugacityCoefficient(phaseIdx, compIdx, phi);
}
}
};
}
/*!
* \brief Calculates the chemical equilibrium from the component
......@@ -232,7 +232,7 @@ public:
"Flash calculation failed."
" {c_alpha^kappa} = {" << globalMolarities << "}, T = "
<< fluidState.temperature(/*phaseIdx=*/0));
};
}
protected:
......@@ -526,7 +526,7 @@ protected:
int compIdx = (pvIdx - numPhases)%numComponents;
return fs.moleFraction(phaseIdx, compIdx);
}
};
}
// set a quantity in the fluid state
template <class MaterialLaw, class FluidState>
......@@ -612,7 +612,7 @@ protected:
else {
assert(false);
}
};
}
// set a quantity in the fluid state
template <class FluidState>
......@@ -637,7 +637,7 @@ protected:
int compIdx = (pvIdx - numPhases)%numComponents;
fs.setMoleFraction(phaseIdx, compIdx, value);
}
};
}
template <class FluidState>
static Scalar quantityWeight_(const FluidState &fs, int pvIdx)
......@@ -651,7 +651,7 @@ protected:
// mole fractions
else // if (pvIdx < numPhases + numPhases*numComponents)
return 1.0;
};
}
};
} // end namespace Dumux
......
......@@ -87,6 +87,6 @@ private:
Scalar pe_;
Scalar lambda_;
};
}; // namespace Dumux
} // namespace Dumux
#endif
......@@ -78,6 +78,6 @@ public:
}
};
}; // namespace Dumux
} // namespace Dumux
#endif
......@@ -120,6 +120,6 @@ public:
{ return 0.90; }
};
}; // namespace Dumux
} // namespace Dumux
#endif
......@@ -77,7 +77,7 @@ public:
{
values[wPhaseIdx] = TwoPLaw::krw(params, state.saturation(wPhaseIdx));
values[nPhaseIdx] = TwoPLaw::krn(params, state.saturation(wPhaseIdx));
};
}
};
}
......
......@@ -115,7 +115,7 @@ public:
{
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
values[phaseIdx] = std::max(std::min(state.saturation(phaseIdx),1.0),0.0);
};
}
};
}
......
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