STYLE: Quenching compiler warning -- mainly unused variables
This commit is contained in:
parent
c2bb0955cd
commit
28ec694f9d
20 changed files with 35 additions and 49 deletions
|
@ -112,12 +112,6 @@ Foam::axisCoordinateRotation::axisCoordinateRotation
|
||||||
scalar theta = readScalar(dict.lookup("theta"));
|
scalar theta = readScalar(dict.lookup("theta"));
|
||||||
scalar psi = readScalar(dict.lookup("psi"));
|
scalar psi = readScalar(dict.lookup("psi"));
|
||||||
|
|
||||||
bool inDegrees = true;
|
|
||||||
if (dict.found("degrees"))
|
|
||||||
{
|
|
||||||
inDegrees = Switch(dict.lookup("degrees"));
|
|
||||||
}
|
|
||||||
|
|
||||||
calcTransform
|
calcTransform
|
||||||
(
|
(
|
||||||
phi,
|
phi,
|
||||||
|
|
|
@ -27,6 +27,7 @@ License
|
||||||
#include "dimensionedScalar.H"
|
#include "dimensionedScalar.H"
|
||||||
#include "equationReader.H"
|
#include "equationReader.H"
|
||||||
#include "equationOperation.H"
|
#include "equationOperation.H"
|
||||||
|
#include "error.H"
|
||||||
//#include "equationOperationList.H"
|
//#include "equationOperationList.H"
|
||||||
|
|
||||||
class dimensionedScalar;
|
class dimensionedScalar;
|
||||||
|
@ -396,6 +397,16 @@ Foam::word Foam::equationOperation::opName
|
||||||
return "min";
|
return "min";
|
||||||
case otstabilise:
|
case otstabilise:
|
||||||
return "stabilise";
|
return "stabilise";
|
||||||
|
default:
|
||||||
|
FatalErrorIn
|
||||||
|
(
|
||||||
|
"Foam::word Foam::equationOperation::opName"
|
||||||
|
"(const Foam::equationOperation::operationType& op)"
|
||||||
|
)
|
||||||
|
<< "invalid operation"
|
||||||
|
<< exit(FatalError);
|
||||||
|
|
||||||
|
return "invalid";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -423,6 +434,16 @@ Foam::word Foam::equationOperation::sourceName
|
||||||
return "equation";
|
return "equation";
|
||||||
case slstorage:
|
case slstorage:
|
||||||
return "memory";
|
return "memory";
|
||||||
|
default:
|
||||||
|
FatalErrorIn
|
||||||
|
(
|
||||||
|
"Foam::word Foam::equationOperation::opName"
|
||||||
|
"(const Foam::equationOperation::operationType& op)"
|
||||||
|
)
|
||||||
|
<< "invalid source"
|
||||||
|
<< exit(FatalError);
|
||||||
|
|
||||||
|
return "invalid";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,6 @@ Foam::tmp<Foam::scalarField> Foam::mixingPlaneGAMGInterface::agglomerateCoeffs
|
||||||
// AMG agglomeration missing
|
// AMG agglomeration missing
|
||||||
notImplemented("mixingPlaneGAMGInterface::agglomerateCoeffs");
|
notImplemented("mixingPlaneGAMGInterface::agglomerateCoeffs");
|
||||||
tmp<scalarField> tcoarseCoeffs(new scalarField(size(), 0.0));
|
tmp<scalarField> tcoarseCoeffs(new scalarField(size(), 0.0));
|
||||||
scalarField& coarseCoeffs = tcoarseCoeffs();
|
|
||||||
|
|
||||||
return tcoarseCoeffs;
|
return tcoarseCoeffs;
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,6 @@ void Foam::polyMesh::initMesh()
|
||||||
nCells++;
|
nCells++;
|
||||||
|
|
||||||
label nUsedFaces = 0;
|
label nUsedFaces = 0;
|
||||||
label nIntFaces = 0;
|
|
||||||
|
|
||||||
// Use patch info if provided, use all faces otherwise
|
// Use patch info if provided, use all faces otherwise
|
||||||
if (boundary_.size())
|
if (boundary_.size())
|
||||||
|
@ -110,13 +109,11 @@ void Foam::polyMesh::initMesh()
|
||||||
nUsedFaces =
|
nUsedFaces =
|
||||||
boundary_[boundary_.size() - 1].start()
|
boundary_[boundary_.size() - 1].start()
|
||||||
+ boundary_[boundary_.size() - 1].size();
|
+ boundary_[boundary_.size() - 1].size();
|
||||||
nIntFaces = boundary_[0].start();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// No patch info. Assume all faces are used.
|
// No patch info. Assume all faces are used.
|
||||||
nUsedFaces = owner_.size();
|
nUsedFaces = owner_.size();
|
||||||
nIntFaces = neighbour_.size();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,8 @@ bool dynamicTopoFvMesh::meshQuality
|
||||||
label nCells = 0, minCell = -1;
|
label nCells = 0, minCell = -1;
|
||||||
scalar maxQuality = -GREAT;
|
scalar maxQuality = -GREAT;
|
||||||
scalar minQuality = GREAT;
|
scalar minQuality = GREAT;
|
||||||
scalar cQuality, meanQuality = 0.0;
|
scalar cQuality = 0.0;
|
||||||
|
scalar meanQuality = 0.0;
|
||||||
|
|
||||||
// Track slivers
|
// Track slivers
|
||||||
bool sliversAbsent = true;
|
bool sliversAbsent = true;
|
||||||
|
@ -1682,7 +1683,8 @@ bool dynamicTopoFvMesh::checkCollapse
|
||||||
) const
|
) const
|
||||||
{
|
{
|
||||||
label faceIndex = -1;
|
label faceIndex = -1;
|
||||||
scalar cQuality = 0.0, oldVolume = 0.0;
|
scalar cQuality = 0.0;
|
||||||
|
scalar oldVolume = 0.0;
|
||||||
const cell& cellToCheck = cells_[cellIndex];
|
const cell& cellToCheck = cells_[cellIndex];
|
||||||
|
|
||||||
// Look for a face that doesn't contain 'pointIndex'
|
// Look for a face that doesn't contain 'pointIndex'
|
||||||
|
|
|
@ -180,7 +180,8 @@ void eMesh::calcEdgePoints() const
|
||||||
// NOTE: Will work only on tetrahedral meshes!
|
// NOTE: Will work only on tetrahedral meshes!
|
||||||
|
|
||||||
bool found;
|
bool found;
|
||||||
label faceIndex = -1, cellIndex = -1;
|
label faceIndex = -1
|
||||||
|
label cellIndex = -1;
|
||||||
const labelList& owner = mesh_.faceOwner();
|
const labelList& owner = mesh_.faceOwner();
|
||||||
const labelList& neighbour = mesh_.faceNeighbour();
|
const labelList& neighbour = mesh_.faceNeighbour();
|
||||||
const cellList& cells = mesh_.cells();
|
const cellList& cells = mesh_.cells();
|
||||||
|
|
|
@ -14,13 +14,10 @@
|
||||||
|
|
||||||
if(valves_[valveI].curLift() >= valves_[valveI].deformationLift())
|
if(valves_[valveI].curLift() >= valves_[valveI].deformationLift())
|
||||||
{
|
{
|
||||||
bool isMoving(false);
|
|
||||||
|
|
||||||
if(mag(valves_[valveI].curVelocity()) > 0)
|
if(mag(valves_[valveI].curVelocity()) > 0)
|
||||||
{
|
{
|
||||||
Info<< "Valve n. " << valveI << " is moving with velocity = "
|
Info<< "Valve n. " << valveI << " is moving with velocity = "
|
||||||
<< valves_[valveI].curVelocity() << endl;
|
<< valves_[valveI].curVelocity() << endl;
|
||||||
isMoving = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Info<< "Valve displacement for valve " << valveI << " = "
|
Info<< "Valve displacement for valve " << valveI << " = "
|
||||||
|
|
|
@ -94,7 +94,6 @@ void Foam::layerAR::addZonesAndModifiers()
|
||||||
|
|
||||||
bool foundAtLeastOne = false;
|
bool foundAtLeastOne = false;
|
||||||
scalar zHigher = GREAT;
|
scalar zHigher = GREAT;
|
||||||
scalar zLower = GREAT;
|
|
||||||
scalar dh = GREAT;
|
scalar dh = GREAT;
|
||||||
scalar dl = GREAT;
|
scalar dl = GREAT;
|
||||||
|
|
||||||
|
@ -108,7 +107,6 @@ void Foam::layerAR::addZonesAndModifiers()
|
||||||
{
|
{
|
||||||
if (zPistV - zc > 0 && zPistV - zc < dl)
|
if (zPistV - zc > 0 && zPistV - zc < dl)
|
||||||
{
|
{
|
||||||
zLower = zc;
|
|
||||||
dl = zPistV - zc;
|
dl = zPistV - zc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,6 @@ void Foam::layerARGambit::addZonesAndModifiers()
|
||||||
|
|
||||||
bool foundAtLeastOne = false;
|
bool foundAtLeastOne = false;
|
||||||
scalar zHigher = GREAT;
|
scalar zHigher = GREAT;
|
||||||
scalar zLower = GREAT;
|
|
||||||
scalar dh = GREAT;
|
scalar dh = GREAT;
|
||||||
scalar dl = GREAT;
|
scalar dl = GREAT;
|
||||||
|
|
||||||
|
@ -109,7 +108,6 @@ void Foam::layerARGambit::addZonesAndModifiers()
|
||||||
{
|
{
|
||||||
if (zPistV - zc > 0 && zPistV - zc < dl)
|
if (zPistV - zc > 0 && zPistV - zc < dl)
|
||||||
{
|
{
|
||||||
zLower = zc;
|
|
||||||
dl = zPistV - zc;
|
dl = zPistV - zc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,6 @@ void Foam::simpleTwoStroke::addZonesAndModifiers()
|
||||||
|
|
||||||
bool foundAtLeastOne = false;
|
bool foundAtLeastOne = false;
|
||||||
scalar zHigher = GREAT;
|
scalar zHigher = GREAT;
|
||||||
scalar zLower = GREAT;
|
|
||||||
scalar dh = GREAT;
|
scalar dh = GREAT;
|
||||||
scalar dl = GREAT;
|
scalar dl = GREAT;
|
||||||
|
|
||||||
|
@ -127,7 +126,6 @@ void Foam::simpleTwoStroke::addZonesAndModifiers()
|
||||||
{
|
{
|
||||||
if (zPistV - zc > 0 && zPistV - zc < dl)
|
if (zPistV - zc > 0 && zPistV - zc < dl)
|
||||||
{
|
{
|
||||||
zLower = zc;
|
|
||||||
dl = zPistV - zc;
|
dl = zPistV - zc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
bool foundAtLeastOne = false;
|
bool foundAtLeastOne = false;
|
||||||
scalar zHigher = GREAT;
|
scalar zHigher = GREAT;
|
||||||
scalar zLower = GREAT;
|
|
||||||
scalar dh = GREAT;
|
scalar dh = GREAT;
|
||||||
scalar dl = GREAT;
|
scalar dl = GREAT;
|
||||||
|
|
||||||
|
@ -35,7 +34,6 @@
|
||||||
{
|
{
|
||||||
if (zPistV - zc > 0 && zPistV - zc < dl)
|
if (zPistV - zc > 0 && zPistV - zc < dl)
|
||||||
{
|
{
|
||||||
zLower = zc;
|
|
||||||
dl = zPistV - zc;
|
dl = zPistV - zc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
label nMovingCells = 0;
|
label nMovingCells = 0;
|
||||||
|
|
||||||
label valvePatchID = valves_[i-1].poppetPatchID().index();
|
label valvePatchID = valves_[i-1].poppetPatchID().index();
|
||||||
const polyPatch& valveTopPatch = boundaryMesh()[valvePatchID];
|
|
||||||
scalar minPopZ = min(boundary()[valvePatchID].patch().localPoints()).z();
|
scalar minPopZ = min(boundary()[valvePatchID].patch().localPoints()).z();
|
||||||
|
|
||||||
forAll(cellCentres(),cellI)
|
forAll(cellCentres(),cellI)
|
||||||
|
@ -60,7 +59,6 @@
|
||||||
label nMovingCells = 0;
|
label nMovingCells = 0;
|
||||||
|
|
||||||
label valvePatchID = valves_[i-1].bottomPatchID().index();
|
label valvePatchID = valves_[i-1].bottomPatchID().index();
|
||||||
const polyPatch& valveBottomPatch = boundaryMesh()[valvePatchID];
|
|
||||||
scalar maxPopZ = max(boundary()[valvePatchID].patch().localPoints()).z();
|
scalar maxPopZ = max(boundary()[valvePatchID].patch().localPoints()).z();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,6 @@ void ignitionSite::findIgnitionCells(const fvMesh& mesh)
|
||||||
cellVolumes_[0] = vols[ignCell];
|
cellVolumes_[0] = vols[ignCell];
|
||||||
|
|
||||||
scalar minDist = GREAT;
|
scalar minDist = GREAT;
|
||||||
label nearestCell = 0;
|
|
||||||
label nIgnCells = 1;
|
label nIgnCells = 1;
|
||||||
|
|
||||||
forAll(centres, celli)
|
forAll(centres, celli)
|
||||||
|
@ -66,7 +65,6 @@ void ignitionSite::findIgnitionCells(const fvMesh& mesh)
|
||||||
|
|
||||||
if (dist < minDist)
|
if (dist < minDist)
|
||||||
{
|
{
|
||||||
nearestCell = celli;
|
|
||||||
minDist = dist;
|
minDist = dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -467,7 +467,6 @@ void Foam::parcel::updateParcelProperties
|
||||||
scalar oldhv = fuels.hl(pg, T(), X());
|
scalar oldhv = fuels.hl(pg, T(), X());
|
||||||
scalar Np = N(oldDensity);
|
scalar Np = N(oldDensity);
|
||||||
|
|
||||||
scalar newDensity = oldDensity;
|
|
||||||
scalar newMass = oldMass;
|
scalar newMass = oldMass;
|
||||||
scalar newhg = oldhg;
|
scalar newhg = oldhg;
|
||||||
scalar newhv = oldhv;
|
scalar newhv = oldhv;
|
||||||
|
@ -496,7 +495,6 @@ void Foam::parcel::updateParcelProperties
|
||||||
// the first time
|
// the first time
|
||||||
if (n > 1)
|
if (n > 1)
|
||||||
{
|
{
|
||||||
newDensity = fuels.rho(pg, Tnew, X());
|
|
||||||
newMass = m();
|
newMass = m();
|
||||||
newhg = 0.0;
|
newhg = 0.0;
|
||||||
scalarField Ynew(fuels.Y(X()));
|
scalarField Ynew(fuels.Y(X()));
|
||||||
|
|
|
@ -119,11 +119,6 @@ void LISA::atomizeParcel
|
||||||
scalar rhoFuel = fuels.rho(1.0e+5, p.T(), p.X());
|
scalar rhoFuel = fuels.rho(1.0e+5, p.T(), p.X());
|
||||||
scalar nuFuel = muFuel/rhoFuel;
|
scalar nuFuel = muFuel/rhoFuel;
|
||||||
|
|
||||||
vector uDir = p.U()/mag(p.U());
|
|
||||||
|
|
||||||
scalar uGas = mag(vel & uDir);
|
|
||||||
vector Ug = uGas*uDir;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TL
|
TL
|
||||||
It might be the relative velocity between Liquid and Gas, but I use the
|
It might be the relative velocity between Liquid and Gas, but I use the
|
||||||
|
|
|
@ -124,9 +124,6 @@ void SHF::breakupParcel
|
||||||
scalar reLiquid = p.Re(rhoLiquid, vel, muLiquid);
|
scalar reLiquid = p.Re(rhoLiquid, vel, muLiquid);
|
||||||
scalar ohnesorge = sqrt(weLiquid)/(reLiquid + VSMALL);
|
scalar ohnesorge = sqrt(weLiquid)/(reLiquid + VSMALL);
|
||||||
|
|
||||||
vector acceleration = p.Urel(vel)/p.tMom();
|
|
||||||
vector trajectory = p.U()/mag(p.U());
|
|
||||||
|
|
||||||
vector vRel = p.Urel(vel);
|
vector vRel = p.Urel(vel);
|
||||||
|
|
||||||
scalar weGasCorr = weGas/(1.0 + weCorrCoeff_ * ohnesorge);
|
scalar weGasCorr = weGas/(1.0 + weCorrCoeff_ * ohnesorge);
|
||||||
|
|
|
@ -256,9 +256,6 @@ void blobsSwirlInjector::calculateHX
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
scalar hOLD = -100.0;
|
|
||||||
scalar xOLD = -100.0;
|
|
||||||
|
|
||||||
label i;
|
label i;
|
||||||
|
|
||||||
for(i=0; i<20; i++)
|
for(i=0; i<20; i++)
|
||||||
|
@ -287,9 +284,6 @@ void blobsSwirlInjector::calculateHX
|
||||||
|
|
||||||
x_ = sqr(1.0 - 2.0 * h_/injectorDiameter);
|
x_ = sqr(1.0 - 2.0 * h_/injectorDiameter);
|
||||||
|
|
||||||
hOLD = h_;
|
|
||||||
xOLD = x_;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
x_ = sqr(1.0 - 2.0 * h_/injectorDiameter);
|
x_ = sqr(1.0 - 2.0 * h_/injectorDiameter);
|
||||||
|
|
|
@ -2955,7 +2955,6 @@ char *timestring ( void )
|
||||||
# define TIME_SIZE 29
|
# define TIME_SIZE 29
|
||||||
|
|
||||||
const struct tm *tm;
|
const struct tm *tm;
|
||||||
size_t len;
|
|
||||||
time_t now;
|
time_t now;
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
|
@ -2964,7 +2963,7 @@ char *timestring ( void )
|
||||||
|
|
||||||
s = new char[TIME_SIZE];
|
s = new char[TIME_SIZE];
|
||||||
|
|
||||||
len = strftime ( s, TIME_SIZE, "%d %B %Y %I:%M:%S %p", tm );
|
strftime ( s, TIME_SIZE, "%d %B %Y %I:%M:%S %p", tm );
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
# undef TIME_SIZE
|
# undef TIME_SIZE
|
||||||
|
|
|
@ -179,10 +179,12 @@ void Foam::multiSolver::synchronizeParallel() const
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Recieve go signal
|
// Receive go signal
|
||||||
{
|
{
|
||||||
IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
|
IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
|
||||||
bool okayToGo(readBool(fromMaster));
|
// Quenching compiler warning
|
||||||
|
// HR, 18/Jul/2013
|
||||||
|
readBool(fromMaster);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
// Common elements in the constructor initialization list for multiSolver
|
// Common elements in the constructor initialization list for multiSolver
|
||||||
|
|
||||||
multiDicts_(NULL),
|
// Quenching compiler warning
|
||||||
|
// HR, 18/Jul/2013
|
||||||
|
multiDicts_(0),
|
||||||
|
|
||||||
multiSolverControl_(multiControlDict_.subDict("multiSolverControl")),
|
multiSolverControl_(multiControlDict_.subDict("multiSolverControl")),
|
||||||
solverDomains_(multiControlDict_.subDict("solverDomains")),
|
solverDomains_(multiControlDict_.subDict("solverDomains")),
|
||||||
|
|
Reference in a new issue