Commit cea265a3 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove some superfluous semicolons

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8222 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 2b385df7
......@@ -115,7 +115,7 @@ public:
(*K)[globalIdx]= spatialParams.intrinsicPermeability(*elemIt,
fvGeometry,
i);
};
}
}
writer.attachVertexData(*p, "p");
......
......@@ -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
......
......@@ -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)
{
......
......@@ -92,7 +92,7 @@ public:
if (!succeeded) {
DUNE_THROW(NumericalProblem,
"A process did not succeed in linearizing the system");
};
}
}
/*!
......
......@@ -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;
};
}
}
......
......@@ -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
......
......@@ -376,8 +376,8 @@ protected:
curPriVar_(scvIdx, pvIdx) - dirichletValues[pvIdx];
storageTerm_[scvIdx][eqIdx] = 0.0;
};
};
}
}
}
/*!
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -188,7 +188,7 @@ public:
(*mobN)[globalIdx] = volVars.mobility(nPhaseIdx);
(*poro)[globalIdx] = volVars.porosity();
(*Te)[globalIdx] = volVars.temperature();
};
}
}
writer.attachVertexData(*Sn, "Sn");
......
......@@ -64,7 +64,7 @@ public:
eq2pvIdx_[i] = i;
pv2eqIdx_[i] = i;
};
}
}
/*!
......
......@@ -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 &paramTypeName,
......
......@@ -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();
};
}
}
......
......@@ -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;
}
......
......@@ -84,7 +84,7 @@ public:
if(indicatorVector_.size() != problem_.variables().cellDataGlobal().size())
{
indicatorVector_.resize(problem_.variables().cellDataGlobal().size());
};
}
indicatorVector_ = -1e100;
Scalar globalMax = -1e100;
......
......@@ -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");
......
......@@ -151,7 +151,7 @@ protected:
this->face().grad[idx][dimIdx] *
elemVolVars[idx].fluidState().moleFraction(phaseIdx, comp1Idx);
}
};
}
Valgrind::CheckDefined(massFraction_);
Valgrind::CheckDefined(diffusionCoeff_);
......
......@@ -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");
......
......@@ -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");
......
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