From 39d52d47425399a8457fee51fd88708728243d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
Date: Tue, 20 Feb 2018 06:40:10 +0100
Subject: [PATCH] [cleanup] Remove superfluous semicolons
---
dumux/material/components/mesitylene.hh | 2 +-
dumux/material/components/xylene.hh | 2 +-
dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh | 2 +-
.../2p/sequential/diffusion/cellcentered/velocity.hh | 2 +-
dumux/porousmediumflow/3pwateroil/volumevariables.hh | 4 ++--
.../compositional/primaryvariableswitch.hh | 8 ++++----
.../1pncmin/implicit/thermochemproblem.hh | 2 +-
.../porousmediumflow/mpnc/implicit/combustionproblem1c.hh | 4 ++--
.../mpnc/implicit/combustionspatialparams.hh | 4 ++--
.../mpnc/implicit/evaporationatmospherespatialparams.hh | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 524b754cd1..d0aa656f6f 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -40,7 +40,7 @@ namespace Dumux
template <class Scalar>
class Mesitylene : public Component<Scalar, Mesitylene<Scalar> >
{
- using Consts = Constants<Scalar>;;
+ using Consts = Constants<Scalar>;
public:
/*!
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index ce5a7a9af4..d234602148 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -41,7 +41,7 @@ namespace Dumux
template <class Scalar>
class Xylene : public Component<Scalar, Xylene<Scalar> >
{
- using Consts = Constants<Scalar>;;
+ using Consts = Constants<Scalar>;
public:
/*!
diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
index db51258e8a..42b02d3abf 100644
--- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
@@ -178,7 +178,7 @@ public:
switch (phaseIdx) {
case wPhaseIdx: return "w";
case nPhaseIdx: return "n";
- case gPhaseIdx: return "g";;
+ case gPhaseIdx: return "g";
};
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
index 620fc97483..4632a94ca8 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
@@ -135,7 +135,7 @@ public:
viscosity_[wPhaseIdx] = 0.;
viscosity_[nPhaseIdx] = 0.;
- vtkOutputLevel_ = getParam<int>("Vtk.OutputLevel");;
+ vtkOutputLevel_ = getParam<int>("Vtk.OutputLevel");
}
// For initialization
diff --git a/dumux/porousmediumflow/3pwateroil/volumevariables.hh b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
index 805e32f29c..410866474e 100644
--- a/dumux/porousmediumflow/3pwateroil/volumevariables.hh
+++ b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
@@ -350,7 +350,7 @@ public:
// water and NAPL are present, phase compositions are a
// mole fractions of non-existing gas phase are used as switching criteria
Scalar partPressH2O = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, wCompIdx);
- Scalar partPressNAPL = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);;
+ Scalar partPressNAPL = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);
Scalar xgn = partPressNAPL/pg_;
Scalar xgw = partPressH2O/pg_;
@@ -601,7 +601,7 @@ public:
else if (phasePresence == wnPhaseOnly) {
// mole fractions of non-existing gas phase are used as switching criteria
Scalar partPressH2O = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, wCompIdx);
- Scalar partPressNAPL = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);;
+ Scalar partPressNAPL = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);
Scalar xgn = partPressNAPL/pg_;
Scalar xgw = partPressH2O/pg_;
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 275cf8780c..867a66d4cf 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -40,16 +40,16 @@ class NoPrimaryVariableSwitch
{
public:
template<typename... Args>
- void init(Args&&... args) {};
+ void init(Args&&... args) {}
template<typename... Args>
- bool wasSwitched(Args&&... args) const { return false; };
+ bool wasSwitched(Args&&... args) const { return false; }
template<typename... Args>
- bool update(Args&&... args) { return false; };
+ bool update(Args&&... args) { return false; }
template<typename... Args>
- bool update_(Args&&... args) {return false; };
+ bool update_(Args&&... args) {return false; }
};
/*!
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index d516c2412c..4967e6863f 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -91,7 +91,7 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index 91f9d57ada..7fc5175b80 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -328,8 +328,8 @@ public:
if (onLeftBoundary_(globalPos))
{
- values[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);;
- values[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);;
+ values[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);
+ values[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);
values[energyEq0Idx] = - massFluxInjectedPhase * fluidState.enthalpy(wPhaseIdx);
}
return values;
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index 47cc7d6f64..c29ba50dec 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -100,7 +100,7 @@ public:
// this is the parameter value from file part
porosity_ = getParam<Scalar>("SpatialParams.PorousMedium.porosity");
intrinsicPermeabilityOutFlow_ = getParam<Scalar>("SpatialParams.Outflow.permeabilityOutFlow");
- porosityOutFlow_ = getParam<Scalar>("SpatialParams.Outflow.porosityOutFlow");;
+ porosityOutFlow_ = getParam<Scalar>("SpatialParams.Outflow.porosityOutFlow");
solidThermalConductivityOutflow_ =getParam<Scalar>("SpatialParams.Outflow.soilThermalConductivityOutFlow");
solidDensity_ = getParam<Scalar>("SpatialParams.soil.density");
solidThermalConductivity_ = getParam<Scalar>("SpatialParams.soil.thermalConductivity");
@@ -304,7 +304,7 @@ public:
}
private:
- static constexpr Scalar eps_ = 1e-6;;
+ static constexpr Scalar eps_ = 1e-6;
// Porous Medium Domain
Scalar intrinsicPermeability_ ;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index 6ace49f6a1..1047128da4 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -537,7 +537,7 @@ public:
{ return heightPM_; }
private:
- static constexpr Scalar eps_ = 1e-6;;
+ static constexpr Scalar eps_ = 1e-6;
Scalar heightDomain_ ;
AwnSurfaceParams aWettingNonWettingSurfaceParams_;
--
GitLab