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

removed some superfluous semicolons and commas causing warnings if -pedantic is used

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7277 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 28c4cfcb
......@@ -61,7 +61,7 @@ class OnePFluxVariables
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
dimWorld = GridView::dimensionworld
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
......
......@@ -61,7 +61,7 @@ class OnePLocalResidual : public BoxLocalResidual<TypeTag>
dimWorld = GridView::dimensionworld,
numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
pressureIdx = Indices::pressureIdx,
pressureIdx = Indices::pressureIdx
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
......@@ -177,6 +177,6 @@ private:
Scalar upwindWeight_;
};
};
}
#endif
......@@ -74,7 +74,7 @@ class OnePBoxModel : public BoxModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePIndices)) Indices;
enum {
dim = GridView::dimension,
dim = GridView::dimension
};
public:
......
......@@ -61,7 +61,7 @@ NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the p
NEW_PROP_TAG(UpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
// \}
};
}
} // end namepace
......
......@@ -88,8 +88,8 @@ public:
};
// \}
};
} // end namepace Properties
} // end namepace
} // end namepace Dumux
#endif
......@@ -58,7 +58,7 @@ class OnePVolumeVariables : public BoxVolumeVariables<TypeTag>
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
......
......@@ -101,9 +101,7 @@ public:
this->resize(numVerts);
int nBoundary = 0;
bool onBoundary[numVerts];
for (int i = 0; i < numVerts; ++i)
onBoundary[i] = false;
std::vector<bool> onBoundary(numVerts, false);
// loop over all intersections of the element and mark all
// vertices in these intersections
......
......@@ -98,7 +98,7 @@ public:
i,
oldSol);
}
};
}
/*!
* \brief Construct the volume variables for all of vertices of an
......@@ -134,7 +134,7 @@ public:
false);
}
};
}
};
} // namespace Dumux
......
......@@ -42,7 +42,7 @@ namespace Properties
NEW_PROP_TAG(Grid);
NEW_PROP_TAG(GridView);
NEW_PROP_TAG(Scalar);
};
}
/////////////////////
// HACK: Functions to initialize the subcontrol volume data
......
......@@ -85,7 +85,7 @@ private:
Red = JacobianAssembler::Red,
Yellow = JacobianAssembler::Yellow,
Green = JacobianAssembler::Green,
Green = JacobianAssembler::Green
};
......
......@@ -757,7 +757,7 @@ public:
createResultWriter_();
resultWriter_->deserialize(res);
model().deserialize(res);
};
}
// \}
......
......@@ -366,8 +366,8 @@ void invertCubicPolynomialPostProcess_(SolContainer &sol,
Scalar fNew = d + x*(c + x*(b + x*a));
if (std::abs(fNew) < std::abs(fOld))
sol[i] = x;
};
};
}
}
/*!
* \ingroup Math
......
......@@ -166,7 +166,7 @@ void print(std::ostream &os = std::cout)
os << *it << " = \"" << tree.get(*it, "") << "\"\n";
};
}
};
}
const char *getString_(const char *foo = 0)
{ return foo; }
......
......@@ -586,7 +586,7 @@ public:
keys_[typeTagName].push_front(Dune::className<Child4>());
if (typeid(Child5) != typeid(void))
keys_[typeTagName].push_front(Dune::className<Child5>());
};
}
template <class TypeTag>
static void addChildren()
......@@ -1030,7 +1030,7 @@ const std::string getDiagnostic(std::string propTagName)
return result;
};
}
//! \internal
template <class TypeTag>
......
......@@ -167,7 +167,7 @@ int startFromDGF(int argc, char **argv)
#endif
return 3;
};
}
/*!
......@@ -240,7 +240,7 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
#endif
return 3;
};
}
#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
// requires DUNE 2.1 and above
......
......@@ -76,7 +76,7 @@ class Restart {
std::ostringstream oss;
oss << simName<<"_time="<<t<<"_rank="<<rank<<".drs";
return oss.str();
};
}
public:
......
......@@ -52,6 +52,6 @@ struct BorderIndex
bool isShared;
};
};
}
#endif
......@@ -151,7 +151,7 @@ public:
// return the result of the solver
return result.converged;
};
}
private:
void prepare_(const Matrix &M)
......
......@@ -81,14 +81,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)
......@@ -104,7 +104,7 @@ public:
bIdx.isShared = true;
borderList_.push_back(bIdx);
};
}
// Access to the foreign border list.
const BorderList &foreignBorderList() const
......
......@@ -223,7 +223,7 @@ public:
viscosity_[phaseIdx] = fs.viscosity(phaseIdx);
}
temperature_ = fs.temperature(0);
};
}
/*!
* \brief Set the temperature [K] of a fluid phase
......
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