From cea265a3909a7c51b4531a5681c6e48f3058cef5 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 4 May 2012 08:32:24 +0000
Subject: [PATCH] remove some superfluous semicolons
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8222 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p/1pmodel.hh | 2 +-
dumux/boxmodels/1p2c/1p2cmodel.hh | 2 +-
dumux/boxmodels/2p2c/2p2cmodel.hh | 10 +++----
dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh | 2 +-
dumux/boxmodels/3p3c/3p3cmodel.hh | 4 +--
dumux/boxmodels/common/boxassembler.hh | 26 +++++++++----------
dumux/boxmodels/common/boxlocalresidual.hh | 4 +--
dumux/boxmodels/common/boxmodel.hh | 4 +--
dumux/boxmodels/mpnc/diffusion/diffusion.hh | 2 +-
dumux/boxmodels/mpnc/mpncmodel.hh | 2 +-
dumux/boxmodels/richards/richardsmodel.hh | 2 +-
dumux/common/boundarytypes.hh | 2 +-
dumux/common/parameters.hh | 4 +--
dumux/common/propertysystem.hh | 6 ++---
dumux/common/splinecommon_.hh | 6 ++---
.../2p/impes/gridadaptionindicator2p.hh | 2 +-
dumux/freeflow/stokes/stokesmodel.hh | 2 +-
.../stokes2c/stokes2cfluxvariables.hh | 2 +-
dumux/freeflow/stokes2c/stokes2cmodel.hh | 2 +-
dumux/freeflow/stokes2cni/stokes2cnimodel.hh | 2 +-
dumux/io/restart.hh | 6 ++---
dumux/io/vtkmultiwriter.hh | 2 +-
dumux/linear/boxlinearsolver.hh | 2 +-
dumux/linear/domesticoverlapfrombcrsmatrix.hh | 12 ++++-----
dumux/linear/foreignoverlapfrombcrsmatrix.hh | 12 ++++-----
dumux/linear/globalindices.hh | 4 +--
dumux/linear/impetbicgstabilu0solver.hh | 2 +-
dumux/linear/overlappingbcrsmatrix.hh | 4 +--
dumux/linear/overlappingblockvector.hh | 6 ++---
dumux/linear/overlappingscalarproduct.hh | 2 +-
dumux/material/components/h2o.hh | 20 +++++++-------
dumux/material/components/iapws/common.hh | 6 ++---
.../material/components/tabulatedcomponent.hh | 6 ++---
.../compositionfromfugacities.hh | 4 +--
.../constraintsolvers/immiscibleflash.hh | 8 +++---
dumux/material/constraintsolvers/ncpflash.hh | 10 +++----
dumux/material/eos/pengrobinson.hh | 6 ++---
dumux/material/eos/pengrobinsonmixture.hh | 2 +-
.../3p/parkerVanGen3pparams.hh | 2 +-
.../h2oairmesitylenefluidsystem.hh | 2 +-
.../fluidsystems/h2oairxylenefluidsystem.hh | 2 +-
.../material/fluidsystems/spe5fluidsystem.hh | 8 +++---
.../fluidsystems/spe5parametercache.hh | 12 ++++-----
dumux/nonlinear/newtonmethod.hh | 2 +-
test/boxmodels/mpnc/obstacleproblem.hh | 2 +-
45 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
index c622a59bc8..6a2299fbbf 100644
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ b/dumux/boxmodels/1p/1pmodel.hh
@@ -115,7 +115,7 @@ public:
(*K)[globalIdx]= spatialParams.intrinsicPermeability(*elemIt,
fvGeometry,
i);
- };
+ }
}
writer.attachVertexData(*p, "p");
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index 38e8ac6747..88ef8f1114 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -189,7 +189,7 @@ public:
massFraction1[globalIdx] = volVars.massFraction(1);
rho[globalIdx] = volVars.density();
mu[globalIdx] = volVars.viscosity();
- };
+ }
#ifdef VELOCITY_OUTPUT // check if velocity output is demanded
// In the box method, the velocity is evaluated on the FE-Grid. However, to get an
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 1529aa4663..3bc1061b1e 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -160,8 +160,8 @@ public:
{
if(eIt->geometry().type().isCube() == false){
velocityOutput_ = false;
- };
- };
+ }
+ }
if (velocityOutput_ != GET_PARAM(TypeTag, bool, EnableVelocityOutput))
std::cout << "ATTENTION: Velocity output only works for cubes and is set to false for simplices\n";
@@ -203,7 +203,7 @@ public:
for (int i = 0; i < eIt->template count<dim>(); ++i)
storage += this->localResidual().storageTerm()[i];
- };
+ }
if (this->gridView_().comm().size() > 1)
storage = this->gridView_().comm().sum(storage);
@@ -372,7 +372,7 @@ public:
{
(*cellNum)[globalIdx] += 1;
}
- };
+ }
if(velocityOutput_)
{
@@ -709,7 +709,7 @@ protected:
globalSol[globalIdx][switchIdx] = 0.0;
else if (formulation == pwSn)
globalSol[globalIdx][switchIdx] = 1.0;
- };
+ }
}
else if (phasePresence == wPhaseOnly)
{
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
index d1a34209a7..7237a0ea5b 100644
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
@@ -92,7 +92,7 @@ public:
if (!succeeded) {
DUNE_THROW(NumericalProblem,
"A process did not succeed in linearizing the system");
- };
+ }
}
/*!
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
index 8b2c80e267..81b059f814 100644
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ b/dumux/boxmodels/3p3c/3p3cmodel.hh
@@ -196,7 +196,7 @@ public:
for (int i = 0; i < elemIt->template count<dim>(); ++i)
dest += this->localResidual().residual(i);
- };
+ }
if (this->gridView_().comm().size() > 1)
dest = this->gridView_().comm().sum(dest);
@@ -349,7 +349,7 @@ public:
(*perm)[globalIdx] = volVars.permeability();
(*temperature)[globalIdx] = volVars.temperature();
(*phasePresence)[globalIdx] = staticVertexDat_[globalIdx].phasePresence;
- };
+ }
}
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index efaed1f17d..c51a66e675 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -193,7 +193,7 @@ public:
if (!succeeded) {
DUNE_THROW(NumericalProblem,
"A process did not succeed in linearizing the system");
- };
+ }
if (printReassembleStatistics)
{
@@ -357,7 +357,7 @@ public:
else
nextReassembleAccuracy_ =
std::max(nextReassembleAccuracy_, vertexDelta_[i]);
- };
+ }
// Mark all red elements
for (; elemIt != elemEndIt; ++elemIt) {
@@ -371,7 +371,7 @@ public:
isRed = true;
break;
}
- };
+ }
// if yes, the element color is also red, else it is not
// red, i.e. green for the mean time
@@ -398,7 +398,7 @@ public:
if (vertexColor_[globalI] != Red) {
vertexColor_[globalI] = Orange;
}
- };
+ }
}
// at this point we communicate the yellow vertices to the
@@ -428,7 +428,7 @@ public:
isYellow = true;
break;
}
- };
+ }
if (isYellow)
elementColor_[elemIdx] = Yellow;
@@ -449,7 +449,7 @@ public:
// if a vertex is orange, recolor it to yellow!
if (vertexColor_[globalI] == Orange)
vertexColor_[globalI] = Yellow;
- };
+ }
}
// demote the border orange vertices
@@ -473,7 +473,7 @@ public:
// set the error of this vertex to 0 because the system
// will be consistently linearized at this vertex
vertexDelta_[i] = 0.0;
- };
+ }
};
/*!
@@ -575,7 +575,7 @@ private:
neighbors[globalI].insert(globalI);
}
continue;
- };
+ }
// loop over all element vertices
for (int i = 0; i < n - 1; ++i) {
@@ -588,7 +588,7 @@ private:
neighbors[globalJ].insert(globalI);
}
}
- };
+ }
// make vertices neighbors to themselfs
for (int i = 0; i < nVerts; ++i)
@@ -636,7 +636,7 @@ private:
for (int i=0; i < numVertices; ++ i) {
storageJacobian_[i] = 0;
storageTerm_[i] = 0;
- };
+ }
}
return;
@@ -663,7 +663,7 @@ private:
for (; colIt != colEndIt; ++colIt) {
(*colIt) = 0.0;
}
- };
+ }
}
// linearize the whole system
@@ -693,7 +693,7 @@ private:
// iteration of the last time step...)
residual_[i] = storageTerm_[i];
residual_[i] *= -1;
- };
+ }
reuseMatrix_ = false;
oldDt_ = curDt;
@@ -717,7 +717,7 @@ private:
{
assembleElement_(elem);
}
- };
+ }
}
// assemble a non-ghost element
diff --git a/dumux/boxmodels/common/boxlocalresidual.hh b/dumux/boxmodels/common/boxlocalresidual.hh
index 39c490fcb0..8202e724fc 100644
--- a/dumux/boxmodels/common/boxlocalresidual.hh
+++ b/dumux/boxmodels/common/boxlocalresidual.hh
@@ -376,8 +376,8 @@ protected:
curPriVar_(scvIdx, pvIdx) - dirichletValues[pvIdx];
storageTerm_[scvIdx][eqIdx] = 0.0;
- };
- };
+ }
+ }
}
/*!
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
index 0d40d55106..bedaf8f8ee 100644
--- a/dumux/boxmodels/common/boxmodel.hh
+++ b/dumux/boxmodels/common/boxmodel.hh
@@ -241,7 +241,7 @@ public:
int globalI = vertexMapper().map(*elemIt, i, dim);
residual[globalI] += localResidual().residual(i);
}
- };
+ }
// calculate the square norm of the residual
Scalar result2 = residual.two_norm2();
@@ -277,7 +277,7 @@ public:
for (int i = 0; i < elemIt->template count<dim>(); ++i)
storage += localResidual().storageTerm()[i];
- };
+ }
if (gridView_().comm().size() > 1)
storage = gridView_().comm().sum(storage);
diff --git a/dumux/boxmodels/mpnc/diffusion/diffusion.hh b/dumux/boxmodels/mpnc/diffusion/diffusion.hh
index 8b91c78e55..e30328fc87 100644
--- a/dumux/boxmodels/mpnc/diffusion/diffusion.hh
+++ b/dumux/boxmodels/mpnc/diffusion/diffusion.hh
@@ -104,7 +104,7 @@ protected:
M[compIIdx][compIIdx] -= fluxVars.moleFraction(nPhaseIdx, compJIdx) / Dij;
}
}
- };
+ }
for (int compIIdx = 0; compIIdx < numComponents; ++compIIdx) {
M[numComponents - 1][compIIdx] = 1.0;
diff --git a/dumux/boxmodels/mpnc/mpncmodel.hh b/dumux/boxmodels/mpnc/mpncmodel.hh
index 76cb49979c..ef7e431946 100644
--- a/dumux/boxmodels/mpnc/mpncmodel.hh
+++ b/dumux/boxmodels/mpnc/mpncmodel.hh
@@ -172,7 +172,7 @@ public:
const ElementIterator elemEndIt = this->gridView_().template end<0>();
for (; elemIt != elemEndIt; ++elemIt) {
this->localResidual().addPhaseStorage(phaseStorage, *elemIt, phaseIdx);
- };
+ }
if (this->gridView_().comm().size() > 1)
phaseStorage = this->gridView_().comm().sum(phaseStorage);
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index 344308fe39..36296581d5 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -188,7 +188,7 @@ public:
(*mobN)[globalIdx] = volVars.mobility(nPhaseIdx);
(*poro)[globalIdx] = volVars.porosity();
(*Te)[globalIdx] = volVars.temperature();
- };
+ }
}
writer.attachVertexData(*Sn, "Sn");
diff --git a/dumux/common/boundarytypes.hh b/dumux/common/boundarytypes.hh
index c2f931f176..8602c67e1d 100644
--- a/dumux/common/boundarytypes.hh
+++ b/dumux/common/boundarytypes.hh
@@ -64,7 +64,7 @@ public:
eq2pvIdx_[i] = i;
pv2eqIdx_[i] = i;
- };
+ }
}
/*!
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index ae807cafdc..3cbfc1e096 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -188,7 +188,7 @@ void print(std::ostream &os = std::cout)
std::list<std::string>::const_iterator it = unusedParams.begin();
for (; it != unusedParams.end(); ++it) {
os << *it << " = \"" << tree.get(*it, "") << "\"\n";
- };
+ }
}
}
@@ -246,7 +246,7 @@ private:
paramTypeName = b.paramTypeName;
groupName = b.groupName;
return *this;
- };
+ }
};
static void check_(const std::string ¶mTypeName,
diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index a0f5f6ce49..7fc94a173e 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -121,7 +121,7 @@ namespace Properties
static int init() { \
TypeTagRegistry::addChildren<__VA_ARGS__>(); \
return 0; \
- }; \
+ } \
static int foo; \
}; \
int TypeTagInfo<DUMUX_GET_HEAD_(__VA_ARGS__)>::foo = \
@@ -971,7 +971,7 @@ inline bool getDiagnostic_(const std::string &typeTagName,
if (it->second.propertyName() == propTagName) {
key = &it->second;
break;
- };
+ }
}
if (key) {
@@ -1028,7 +1028,7 @@ const std::string getDiagnostic(std::string propTagName)
<< ":" << key.lineDefined()
<<"\n";
result = oss.str();
- };
+ }
}
diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index 64f2aaea7b..79418c2697 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -476,7 +476,7 @@ protected:
M[i][i] = 2;
M[i][i + 1] = lambda_i;
d[i] = d_i;
- };
+ }
// first row
M[0][0] = 2;
@@ -574,7 +574,7 @@ protected:
// or decreasing
x0 = x1;
return (x0*(x0*3*a + 2*b) + c > 0) ? 1 : -1;
- };
+ }
if ((x0 < xE1 && xE1 < x1) ||
(x0 < xE2 && xE2 < x1))
{
@@ -629,7 +629,7 @@ protected:
iHigh = i;
else
iLow = i;
- };
+ }
return iLow;
}
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index d67a0d5f31..fc96588f68 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -84,7 +84,7 @@ public:
if(indicatorVector_.size() != problem_.variables().cellDataGlobal().size())
{
indicatorVector_.resize(problem_.variables().cellDataGlobal().size());
- };
+ }
indicatorVector_ = -1e100;
Scalar globalMax = -1e100;
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index a85505926e..57ac51aebf 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -193,7 +193,7 @@ public:
rho[globalIdx] = volVars.density();
mu[globalIdx] = volVars.viscosity();
velocity[globalIdx] = volVars.velocity();
- };
+ }
}
writer.attachVertexData(pN, "P");
writer.attachVertexData(delP, "delP");
diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
index 814d851ef5..61d4766878 100644
--- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
@@ -151,7 +151,7 @@ protected:
this->face().grad[idx][dimIdx] *
elemVolVars[idx].fluidState().moleFraction(phaseIdx, comp1Idx);
}
- };
+ }
Valgrind::CheckDefined(massFraction_);
Valgrind::CheckDefined(diffusionCoeff_);
diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh
index 0dcd00e2ca..d0416b5e44 100644
--- a/dumux/freeflow/stokes2c/stokes2cmodel.hh
+++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh
@@ -143,7 +143,7 @@ public:
mu[globalIdx] = volVars.viscosity()*scale_;
velocity[globalIdx] = volVars.velocity();
velocity[globalIdx] *= 1/scale_;
- };
+ }
}
writer.attachVertexData(pN, "P");
writer.attachVertexData(delP, "delP");
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index bb58c82a1b..1f91534f10 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -156,7 +156,7 @@ public:
h [globalIdx] = volVars.enthalpy();
// D [globalIdx] = volVars.diffusionCoeff();
velocity[globalIdx] = volVars.velocity();
- };
+ }
}
writer.attachVertexData(pN, "pg");
writer.attachVertexData(delP, "delP");
diff --git a/dumux/io/restart.hh b/dumux/io/restart.hh
index 087b84e166..c6511aee38 100644
--- a/dumux/io/restart.hh
+++ b/dumux/io/restart.hh
@@ -149,7 +149,7 @@ public:
for (; it != endIt; ++it) {
serializer.serializeEntity(outStream_, *it);
outStream_ << "\n";
- };
+ }
serializeSectionEnd();
}
@@ -237,7 +237,7 @@ public:
if (!std::isspace(dummy[i])) {
DUNE_THROW(Dune::InvalidStateException,
"Encountered unread values while deserializing");
- };
+ }
}
}
@@ -271,7 +271,7 @@ public:
std::getline(inStream_, curLine);
std::istringstream curLineStream(curLine);
deserializer.deserializeEntity(curLineStream, *it);
- };
+ }
deserializeSectionEnd();
}
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index 02639d91ba..7fa03f7b3d 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -345,7 +345,7 @@ public:
else {
std::string tmp;
std::getline(res.deserializeStream(), tmp);
- };
+ }
res.deserializeSectionEnd();
}
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index d9e675390e..c04d1a8be3 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -114,7 +114,7 @@ public:
// make sure that the overlapping matrix and block vectors
// have been created
prepare_(M);
- };
+ }
// copy the values of the non-overlapping linear system of
// equations to the overlapping one. On ther border, we add up
diff --git a/dumux/linear/domesticoverlapfrombcrsmatrix.hh b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
index c0b866c4a8..ad68c516aa 100644
--- a/dumux/linear/domesticoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
@@ -273,7 +273,7 @@ public:
{
if (isLocal(domesticIdx)) {
return foreignOverlap_.masterOf(domesticIdx) == peerRank;
- };
+ }
// if the local index is a border index, loop over all ranks
// for which this index is also a border index. the lowest
@@ -347,21 +347,21 @@ protected:
for (; peerIt != peerEndIt; ++peerIt) {
int peerRank = *peerIt;
sendIndicesToPeer_(peerRank);
- };
+ }
// receive our overlap from the processes to all peer processes
peerIt = foreignOverlap_.peerSet().begin();
for (; peerIt != peerEndIt; ++peerIt) {
int peerRank = *peerIt;
receiveIndicesFromPeer_(peerRank);
- };
+ }
// receive our overlap from the processes to all peer processes
peerIt = foreignOverlap_.peerSet().begin();
for (; peerIt != peerEndIt; ++peerIt) {
int peerRank = *peerIt;
waitSendIndices_(peerRank);
- };
+ }
};
void sendIndicesToPeer_(int peerRank)
@@ -406,8 +406,8 @@ protected:
{
(*peersSendBuff_[peerRank][i])[2*j + 0] = it->first;
(*peersSendBuff_[peerRank][i])[2*j + 1] = it->second;
- };
- };
+ }
+ }
// send all messages
indicesSendBuff_[peerRank]->send(peerRank);
diff --git a/dumux/linear/foreignoverlapfrombcrsmatrix.hh b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
index a2bddf24fd..a978645a43 100644
--- a/dumux/linear/foreignoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
@@ -255,7 +255,7 @@ public:
ForeignOverlapWithPeer::const_iterator rowEndIt = it->second.end();
for (; rowIt != rowEndIt; ++rowIt) {
std::cout << std::tr1::get<0>(*rowIt) << "(" << std::tr1::get<1>(*rowIt) << ") ";
- };
+ }
std::cout << "\n";
}
};
@@ -280,7 +280,7 @@ protected:
it->peerRank,
it->borderDistance));
borderIndices_.insert(it->localIdx);
- };
+ }
};
// given a list of border indices and provided that
@@ -319,7 +319,7 @@ protected:
masterRank_[it->localIdx] = myRank_;
else
isShared_[it->localIdx] = true;
- };
+ }
// overwrite the master rank of the non-shared border on the
// domestic overlap
@@ -329,7 +329,7 @@ protected:
if (!it->isShared) {
masterRank_[it->localIdx] = it->peerRank;
}
- };
+ }
}
@@ -440,8 +440,8 @@ protected:
for (; it != endIt; ++it) {
IndexDistanceNpeers tmp(i, it->second, nRanks);
foreignOverlapByRank_[it->first].push_back(tmp);
- };
- };
+ }
+ }
}
// set of processes with which we have to communicate
diff --git a/dumux/linear/globalindices.hh b/dumux/linear/globalindices.hh
index 4f51e9bf60..88dacfd41d 100644
--- a/dumux/linear/globalindices.hh
+++ b/dumux/linear/globalindices.hh
@@ -200,7 +200,7 @@ public:
<< ", " << domesticToGlobal(domIdx)
<< ", " << globalToDomestic(domesticToGlobal(domIdx))
<< ") ";
- };
+ }
std::cout << "\n";
};
@@ -255,7 +255,7 @@ protected:
myRank_ + 1, // peer rank
0, // tag
MPI_COMM_WORLD); // communicator
- };
+ }
typename PeerSet::const_iterator peerIt;
typename PeerSet::const_iterator peerEndIt = peerSet_().end();
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index 425cfc7138..de31d2b43f 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -127,7 +127,7 @@ public:
// make sure that the overlapping matrix and block vectors
// have been created
prepare_(M);
- };
+ }
// copy the values of the non-overlapping linear system of
// equations to the overlapping one. On ther border, we add up
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index 627f28e199..3907a27e0e 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -213,9 +213,9 @@ public:
std::cout << " ";
}
std::cout << "\n";
- };
+ }
Dune::printmatrix(std::cout, *static_cast<const BCRSMatrix*>(this), "M", "row");
- };
+ }
private:
void build_(const BCRSMatrix &M)
diff --git a/dumux/linear/overlappingblockvector.hh b/dumux/linear/overlappingblockvector.hh
index 672bd27917..d72e7b9ce3 100644
--- a/dumux/linear/overlappingblockvector.hh
+++ b/dumux/linear/overlappingblockvector.hh
@@ -261,7 +261,7 @@ public:
if (overlap_->isFront(i)) {
(*this)[i] = value;
}
- };
+ }
}
/*!
@@ -272,14 +272,14 @@ public:
int numDomestic = overlap_->numDomestic();
for (int i = overlap_->numLocal(); i < numDomestic; ++i) {
(*this)[i] = value;
- };
+ }
}
void print() const
{
for (int i = 0; i < this->size(); ++i) {
std::cout << "row " << i << (overlap_->isLocal(i)?" ":"*") << ": " << (*this)[i] << "\n";
- };
+ }
};
private:
diff --git a/dumux/linear/overlappingscalarproduct.hh b/dumux/linear/overlappingscalarproduct.hh
index c7902b61dd..cd7b0e4aa0 100644
--- a/dumux/linear/overlappingscalarproduct.hh
+++ b/dumux/linear/overlappingscalarproduct.hh
@@ -54,7 +54,7 @@ public:
for (int i = 0; i < n; ++i) {
if (overlap_.iAmMasterOf(i))
sum += x[i]*y[i];
- };
+ }
// compute the global sum
double sumGlobal = 0.0;
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 87c5774a1e..5d874c6b04 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -185,7 +185,7 @@ public:
return
enthalpyRegion2_(temperature, pv) +
(pressure - pv)*dh_dp;
- };
+ }
return enthalpyRegion2_(temperature, pressure);
}
@@ -226,7 +226,7 @@ public:
return
enthalpyRegion1_(temperature, pv) +
(pressure - pv)*dh_dp;
- };
+ }
return enthalpyRegion1_(temperature, pressure);
}
@@ -263,7 +263,7 @@ public:
// cap at the vapor pressure to regularize
return
heatCap_p_Region2_(temperature, pv);
- };
+ }
return heatCap_p_Region2_(temperature, pressure);
}
@@ -295,7 +295,7 @@ public:
// the pressure is too low, in this case we use the heat cap at the vapor pressure to regularize
return
heatCap_p_Region1_(temperature, pv);
- };
+ }
return heatCap_p_Region1_(temperature, pressure);
}
@@ -352,7 +352,7 @@ public:
Scalar uvPEps = internalEnergyRegion1_(temperature, pv + eps);
Scalar du_dp = (uvPEps - uv)/eps;
return uv + du_dp*(pressure - pv);
- };
+ }
return internalEnergyRegion1_(temperature, pressure);
}
@@ -425,7 +425,7 @@ public:
Scalar uvMEps = internalEnergyRegion2_(temperature, pv - eps);
Scalar du_dp = (uv - uvMEps)/eps;
return uv + du_dp*(pressure - pv);
- };
+ }
return internalEnergyRegion2_(temperature, pressure);
}
@@ -493,7 +493,7 @@ public:
Scalar pv = vaporPressure(temperature);
if (pressure > pv) {
return heatCap_v_Region2_(temperature, pv);
- };
+ }
return heatCap_v_Region2_(temperature, pressure);
}
@@ -577,7 +577,7 @@ public:
// use a straight line for extrapolation
return 1.0/v0 + (pressure - pv)*drho_dp;
- };
+ }
return 1.0/volumeRegion2_(temperature, pressure);
}
@@ -685,7 +685,7 @@ public:
// use a straight line for extrapolation
return 1.0/v0 + (pressure - pv)*drho_dp;
- };
+ }
return 1/volumeRegion1_(temperature, pressure);
}
@@ -773,7 +773,7 @@ public:
DUNE_THROW(NumericalProblem,
"Viscosity of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
- };
+ }
Scalar rho = liquidDensity(temperature, pressure);
return Common::viscosity(temperature, rho);
diff --git a/dumux/material/components/iapws/common.hh b/dumux/material/components/iapws/common.hh
index db52883e08..f637904668 100644
--- a/dumux/material/components/iapws/common.hh
+++ b/dumux/material/components/iapws/common.hh
@@ -129,10 +129,10 @@ public:
for (int j = 0; j <= 6; ++j) {
tmp += Hij[i][j]*tmp2;
tmp2 *= (rhoBar - 1);
- };
+ }
muBar += tmp3 * tmp;
tmp3 *= 1.0/TBar - 1;
- };
+ }
muBar *= rhoBar;
muBar = std::exp(muBar);
@@ -146,7 +146,7 @@ public:
for (int i = 0; i < 4; ++i) {
tmp += H[i]/tmp2;
tmp2 *= TBar;
- };
+ }
muBar /= tmp;
return 1e-6*muBar;
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index b08c6fca0d..363493a272 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -147,7 +147,7 @@ public:
try { gasThermalConductivity_[i] = RawComponent::gasThermalConductivity(temperature, pressure); }
catch (Dune::NotImplemented) { gasThermalConductivity_[i] = NaN; }
catch (NumericalProblem) { gasThermalConductivity_[i] = NaN; };
- };
+ }
Scalar plMin = minLiquidPressure_(iT);
Scalar plMax = maxLiquidPressure_(iT);
@@ -202,7 +202,7 @@ public:
try { gasPressure_[i] = RawComponent::gasPressure(temperature, density); }
catch (NumericalProblem) { gasPressure_[i] = NaN; };
- };
+ }
// calculate the minimum and maximum values for the liquid
// densities
@@ -224,7 +224,7 @@ public:
try { liquidPressure_[i] = RawComponent::liquidPressure(temperature, density); }
catch (NumericalProblem) { liquidPressure_[i] = NaN; };
- };
+ }
}
}
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index 65a4a69dcf..92265d42f5 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -196,7 +196,7 @@ protected:
Scalar gamma = phi * fluidState.pressure(phaseIdx);
fluidState.setFugacityCoefficient(phaseIdx, i, phi);
fluidState.setMoleFraction(phaseIdx, i, fugacities[i]/gamma);
- };
+ }
paramCache.updatePhase(fluidState, phaseIdx);
@@ -374,7 +374,7 @@ protected:
(targetFug[i] - params.fugacity(phaseIdx, i))
/
params.fugacityCoeff(phaseIdx, i) );
- };
+ }
return result;
}
};
diff --git a/dumux/material/constraintsolvers/immiscibleflash.hh b/dumux/material/constraintsolvers/immiscibleflash.hh
index 537bbf107f..bf52d1bc8b 100644
--- a/dumux/material/constraintsolvers/immiscibleflash.hh
+++ b/dumux/material/constraintsolvers/immiscibleflash.hh
@@ -126,7 +126,7 @@ public:
allIncompressible = false;
break;
}
- };
+ }
if (allIncompressible) {
paramCache.updateAll(fluidState);
@@ -139,7 +139,7 @@ public:
/ fluidState.molarDensity(phaseIdx);
fluidState.setSaturation(phaseIdx, saturation);
}
- };
+ }
/////////////////////////
// Newton method
@@ -195,7 +195,7 @@ public:
std::cout << s;
}
std::cout << "\n";
- };
+ }
std::cout << "residual: " << b << "\n";
std::cout << "deltaX: " << deltaX << "\n";
std::cout << "---------------\n";
@@ -342,7 +342,7 @@ protected:
// dampen to at most 30% change in pressure per
// iteration
delta = std::min(0.30*fluidState.pressure(0), std::max(-0.30*fluidState.pressure(0), delta));
- };
+ }
setQuantityRaw_(fluidState, pvIdx, tmp - delta);
}
diff --git a/dumux/material/constraintsolvers/ncpflash.hh b/dumux/material/constraintsolvers/ncpflash.hh
index 18ae58f7e3..d5df6599e9 100644
--- a/dumux/material/constraintsolvers/ncpflash.hh
+++ b/dumux/material/constraintsolvers/ncpflash.hh
@@ -210,7 +210,7 @@ public:
std::cout << s;
}
std::cout << "\n";
- };
+ }
std::cout << "deltaX: " << deltaX << "\n";
std::cout << "---------------\n";
@@ -421,7 +421,7 @@ protected:
// dampen to at most 15% change in pressure per
// iteration
delta = std::min(0.15*fluidState.pressure(0), std::max(-0.15*fluidState.pressure(0), delta));
- };
+ }
setQuantityRaw_(fluidState, pvIdx, tmp - delta);
}
@@ -445,15 +445,15 @@ protected:
if (value < 0)
fluidState.setMoleFraction(phaseIdx, compIdx, 0.0);
}
- };
+ }
// last saturation
if (sumSat > 1.05) {
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
Scalar value = fluidState.saturation(phaseIdx)/(0.95*sumSat);
fluidState.setSaturation(phaseIdx, value);
- };
- };
+ }
+ }
completeFluidState_<MaterialLaw>(fluidState, paramCache, matParams);
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index ef3b5e0048..6ce48d217a 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -302,7 +302,7 @@ protected:
if (hasExtrema)
break;
Tmin /= 2;
- };
+ }
Scalar T = Tmin;
@@ -355,9 +355,9 @@ protected:
}
else
delta /= 2;
- };
+ }
}
- };
+ }
// find the two molar volumes where the EOS exhibits extrema and
// which are larger than the covolume of the phase
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index b5a26f0c74..2a0c20deb4 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -124,7 +124,7 @@ public:
/ sumMoleFractions
* std::sqrt(params.aPure(phaseIdx, compJIdx))
* (1.0 - StaticParameters::interactionCoefficient(compIdx, compJIdx));
- };
+ }
deltai *= tmp;
Scalar base =
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
index 71f738d0bc..a804648b38 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
@@ -121,7 +121,7 @@ public:
case 2:
return Sgr_;
break;
- };
+ }
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
index 7ef6d87462..583d5de5be 100644
--- a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
@@ -381,7 +381,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"Diffusivity of water in the water phase "
"is constraint by sum of diffusive fluxes = 0 !\n");
- };
+ }
} else if (phaseIdx==nPhaseIdx) {
DUNE_THROW(Dune::InvalidStateException,
diff --git a/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
index de70ece7b7..22eac194bc 100644
--- a/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
@@ -338,7 +338,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"Diffusivity of water in the water phase "
"is constraint by sum of diffusive fluxes = 0 !\n");
- };
+ }
} else if (phaseIdx==nPhaseIdx) {
DUNE_THROW(Dune::InvalidStateException,
diff --git a/dumux/material/fluidsystems/spe5fluidsystem.hh b/dumux/material/fluidsystems/spe5fluidsystem.hh
index 825f759a4c..697d9b9e90 100644
--- a/dumux/material/fluidsystems/spe5fluidsystem.hh
+++ b/dumux/material/fluidsystems/spe5fluidsystem.hh
@@ -326,7 +326,7 @@ public:
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
- };
+ }
prParams.updatePure(maxT, minP);
for (int compIdx = 0; compIdx < numComponents; ++compIdx) {
@@ -334,7 +334,7 @@ public:
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
- };
+ }
prParams.updatePure(minT, maxP);
for (int compIdx = 0; compIdx < numComponents; ++compIdx) {
@@ -342,7 +342,7 @@ public:
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
- };
+ }
prParams.updatePure(maxT, maxP);
for (int compIdx = 0; compIdx < numComponents; ++compIdx) {
@@ -350,7 +350,7 @@ public:
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
- };
+ }
PengRobinson::init(/*aMin=*/minA, /*aMax=*/maxA, /*na=*/100,
/*bMin=*/minB, /*bMax=*/maxB, /*nb=*/200);
diff --git a/dumux/material/fluidsystems/spe5parametercache.hh b/dumux/material/fluidsystems/spe5parametercache.hh
index 4a65b244cb..1772d53f0d 100644
--- a/dumux/material/fluidsystems/spe5parametercache.hh
+++ b/dumux/material/fluidsystems/spe5parametercache.hh
@@ -129,7 +129,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"The a() parameter is only defined for "
"oil and gas phases");
- };
+ }
}
/*!
@@ -145,7 +145,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"The b() parameter is only defined for "
"oil and gas phases");
- };
+ }
}
/*!
@@ -163,7 +163,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"The a() parameter is only defined for "
"oil and gas phases");
- };
+ }
}
/*!
@@ -180,7 +180,7 @@ public:
DUNE_THROW(Dune::InvalidStateException,
"The b() parameter is only defined for "
"oil and gas phases");
- };
+ }
}
/*!
@@ -321,8 +321,8 @@ protected:
// convert water density [kg/m^3] to molar volume [m^3/mol]
Vm_[wPhaseIdx] = fs.averageMolarMass(wPhaseIdx)/waterDensity;
- };
- };
+ }
+ }
}
bool VmUpToDate_[numPhases];
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index b994318ef7..db1763d167 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -113,7 +113,7 @@ public:
std::cout << "Newton: Caught exception: \"" << e.what() << "\"\n";
ctl.newtonFail();
return false;
- };
+ }
}
protected:
diff --git a/test/boxmodels/mpnc/obstacleproblem.hh b/test/boxmodels/mpnc/obstacleproblem.hh
index 22617b956f..4c3f4c2563 100644
--- a/test/boxmodels/mpnc/obstacleproblem.hh
+++ b/test/boxmodels/mpnc/obstacleproblem.hh
@@ -386,7 +386,7 @@ private:
// set the gas composition to 99% nitrogen and 1% steam
fs.setMoleFraction(nPhaseIdx, N2Idx, 0.99);
fs.setMoleFraction(nPhaseIdx, H2OIdx, 0.01);
- };
+ }
// set the other saturation
fs.setSaturation(otherPhaseIdx, 1.0 - fs.saturation(refPhaseIdx));
--
GitLab