STYLE: Quench compiler warnings
This commit is contained in:
parent
9f384472d4
commit
15b4256033
19 changed files with 36 additions and 64 deletions
|
@ -76,9 +76,6 @@ int main(int argc, char *argv[])
|
||||||
// Read required accuracy
|
// Read required accuracy
|
||||||
scalar eps = readScalar(PODsolverDict.lookup("eps"));
|
scalar eps = readScalar(PODsolverDict.lookup("eps"));
|
||||||
|
|
||||||
// Interpolation coefficients
|
|
||||||
scalarField& PODcoeffs = equation->coeffs();
|
|
||||||
|
|
||||||
Info<< "\nStarting time loop\n" << endl;
|
Info<< "\nStarting time loop\n" << endl;
|
||||||
|
|
||||||
for (runTime++; !runTime.end(); runTime++)
|
for (runTime++; !runTime.end(); runTime++)
|
||||||
|
|
|
@ -30,6 +30,10 @@
|
||||||
|
|
||||||
const volScalarField& T = thermo.T();
|
const volScalarField& T = thermo.T();
|
||||||
|
|
||||||
|
// dummy statement to quench compiler warning
|
||||||
|
// Note: T is used in engineFoam
|
||||||
|
T.size();
|
||||||
|
|
||||||
Info<< "\nReading field U\n" << endl;
|
Info<< "\nReading field U\n" << endl;
|
||||||
volVectorField U
|
volVectorField U
|
||||||
(
|
(
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
# include "readTimeControls.H"
|
# include "readTimeControls.H"
|
||||||
# include "readPISOControls.H"
|
# include "readPISOControls.H"
|
||||||
|
|
||||||
bool correctPhi = false;
|
|
||||||
if (piso.found("correctPhi"))
|
|
||||||
{
|
|
||||||
correctPhi = Switch(piso.lookup("correctPhi"));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool checkMeshCourantNo = false;
|
bool checkMeshCourantNo = false;
|
||||||
if (piso.found("checkMeshCourantNo"))
|
if (piso.found("checkMeshCourantNo"))
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,8 +80,6 @@ int main(int argc, char *argv[])
|
||||||
// Store divU from the previous mesh for the correctPhi
|
// Store divU from the previous mesh for the correctPhi
|
||||||
volScalarField divU = fvc::div(phi);
|
volScalarField divU = fvc::div(phi);
|
||||||
|
|
||||||
scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
|
|
||||||
|
|
||||||
bool meshChanged = mesh.update();
|
bool meshChanged = mesh.update();
|
||||||
reduce(meshChanged, orOp<bool>());
|
reduce(meshChanged, orOp<bool>());
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
#include "readPISOControls.H"
|
#include "readPISOControls.H"
|
||||||
#include "readTimeControls.H"
|
#include "readTimeControls.H"
|
||||||
|
|
||||||
label nAlphaCorr
|
|
||||||
(
|
|
||||||
readLabel(piso.lookup("nAlphaCorr"))
|
|
||||||
);
|
|
||||||
|
|
||||||
label nAlphaSubCycles
|
label nAlphaSubCycles
|
||||||
(
|
(
|
||||||
readLabel(piso.lookup("nAlphaSubCycles"))
|
readLabel(piso.lookup("nAlphaSubCycles"))
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
#include "readPISOControls.H"
|
#include "readPISOControls.H"
|
||||||
#include "readTimeControls.H"
|
#include "readTimeControls.H"
|
||||||
|
|
||||||
label nAlphaCorr
|
|
||||||
(
|
|
||||||
readLabel(piso.lookup("nAlphaCorr"))
|
|
||||||
);
|
|
||||||
|
|
||||||
label nAlphaSubCycles
|
label nAlphaSubCycles
|
||||||
(
|
(
|
||||||
readLabel(piso.lookup("nAlphaSubCycles"))
|
readLabel(piso.lookup("nAlphaSubCycles"))
|
||||||
|
|
|
@ -78,8 +78,8 @@ int main(int argc, char *argv[])
|
||||||
scalar initialResidual = 1.0;
|
scalar initialResidual = 1.0;
|
||||||
scalar residual = 1.0;
|
scalar residual = 1.0;
|
||||||
surfaceSymmTensorField DSigmaCorrf = fvc::interpolate(DSigmaCorr);
|
surfaceSymmTensorField DSigmaCorrf = fvc::interpolate(DSigmaCorr);
|
||||||
label nCrackedFaces = 0;
|
|
||||||
|
|
||||||
|
//label nCrackedFaces = 0;
|
||||||
// cracking loop if you use cohesive boundaries
|
// cracking loop if you use cohesive boundaries
|
||||||
//do
|
//do
|
||||||
//{
|
//{
|
||||||
|
|
|
@ -212,17 +212,14 @@ bool Foam::bubbleHistory::start()
|
||||||
vector F = fs.totalViscousForce() + fs.totalPressureForce();
|
vector F = fs.totalViscousForce() + fs.totalPressureForce();
|
||||||
|
|
||||||
vector dragDir;
|
vector dragDir;
|
||||||
scalar Uref;
|
|
||||||
|
|
||||||
if(mag(U.value()) > SMALL)
|
if(mag(U.value()) > SMALL)
|
||||||
{
|
{
|
||||||
dragDir = -U.value()/mag(U.value());
|
dragDir = -U.value()/mag(U.value());
|
||||||
Uref = mag(U.value());
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dragDir = fs.g().value()/(mag(fs.g().value()) + SMALL);
|
dragDir = fs.g().value()/(mag(fs.g().value()) + SMALL);
|
||||||
Uref = SMALL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
scalar dragForce = (dragDir&F);
|
scalar dragForce = (dragDir&F);
|
||||||
|
@ -331,17 +328,14 @@ bool Foam::bubbleHistory::execute()
|
||||||
vector F = fs.totalViscousForce() + fs.totalPressureForce();
|
vector F = fs.totalViscousForce() + fs.totalPressureForce();
|
||||||
|
|
||||||
vector dragDir;
|
vector dragDir;
|
||||||
scalar Uref;
|
|
||||||
|
|
||||||
if(mag(U.value()) > SMALL)
|
if(mag(U.value()) > SMALL)
|
||||||
{
|
{
|
||||||
dragDir = -U.value()/mag(U.value());
|
dragDir = -U.value()/mag(U.value());
|
||||||
Uref = mag(U.value());
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dragDir = fs.g().value()/(mag(fs.g().value()) + SMALL);
|
dragDir = fs.g().value()/(mag(fs.g().value()) + SMALL);
|
||||||
Uref = SMALL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
scalar dragForce = (dragDir&F);
|
scalar dragForce = (dragDir&F);
|
||||||
|
|
|
@ -87,7 +87,6 @@ void starMesh::readPoints(const scalar scaleFactor)
|
||||||
if (pointsFile.good())
|
if (pointsFile.good())
|
||||||
{
|
{
|
||||||
label pointLabel;
|
label pointLabel;
|
||||||
scalar x, y, z;
|
|
||||||
|
|
||||||
maxLabel = -1;
|
maxLabel = -1;
|
||||||
while (pointsFile)
|
while (pointsFile)
|
||||||
|
@ -98,9 +97,9 @@ void starMesh::readPoints(const scalar scaleFactor)
|
||||||
|
|
||||||
maxLabel = max(maxLabel, pointLabel);
|
maxLabel = max(maxLabel, pointLabel);
|
||||||
|
|
||||||
x = readVtxCmpt(pointsFile);
|
readVtxCmpt(pointsFile);
|
||||||
y = readVtxCmpt(pointsFile);
|
readVtxCmpt(pointsFile);
|
||||||
z = readVtxCmpt(pointsFile);
|
readVtxCmpt(pointsFile);
|
||||||
|
|
||||||
readToNl(pointsFile);
|
readToNl(pointsFile);
|
||||||
|
|
||||||
|
|
|
@ -199,9 +199,6 @@ Foam::labelList Foam::blockMesh::createMergeList()
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool found = false;
|
|
||||||
|
|
||||||
// N-squared point search over all points of all faces of
|
// N-squared point search over all points of all faces of
|
||||||
// master block over all point of all faces of slave block
|
// master block over all point of all faces of slave block
|
||||||
forAll(blockPfaceFaces, blockPfaceFaceLabel)
|
forAll(blockPfaceFaces, blockPfaceFaceLabel)
|
||||||
|
@ -215,7 +212,7 @@ Foam::labelList Foam::blockMesh::createMergeList()
|
||||||
|
|
||||||
forAll(blockPfaceFacePoints, blockPfaceFacePointLabel)
|
forAll(blockPfaceFacePoints, blockPfaceFacePointLabel)
|
||||||
{
|
{
|
||||||
found = false;
|
bool found = false;
|
||||||
|
|
||||||
forAll(blockNfaceFaces, blockNfaceFaceLabel)
|
forAll(blockNfaceFaces, blockNfaceFaceLabel)
|
||||||
{
|
{
|
||||||
|
@ -307,7 +304,6 @@ Foam::labelList Foam::blockMesh::createMergeList()
|
||||||
|
|
||||||
const labelListList& curPairs = glueMergePairs[blockFaceLabel];
|
const labelListList& curPairs = glueMergePairs[blockFaceLabel];
|
||||||
|
|
||||||
bool foundFace = false;
|
|
||||||
label blockPfaceLabel;
|
label blockPfaceLabel;
|
||||||
for
|
for
|
||||||
(
|
(
|
||||||
|
@ -322,12 +318,10 @@ Foam::labelList Foam::blockMesh::createMergeList()
|
||||||
== blockInternalFaces[blockFaceLabel]
|
== blockInternalFaces[blockFaceLabel]
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
foundFace = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foundFace = false;
|
|
||||||
label blockNfaceLabel;
|
label blockNfaceLabel;
|
||||||
for
|
for
|
||||||
(
|
(
|
||||||
|
@ -342,7 +336,6 @@ Foam::labelList Foam::blockMesh::createMergeList()
|
||||||
== blockInternalFaces[blockFaceLabel]
|
== blockInternalFaces[blockFaceLabel]
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
foundFace = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -396,11 +396,6 @@ void Foam::ensightMesh::writePrimsBinary
|
||||||
{
|
{
|
||||||
label po = pointOffset + 1;
|
label po = pointOffset + 1;
|
||||||
|
|
||||||
// Create a temp int array
|
|
||||||
int numElem;
|
|
||||||
|
|
||||||
numElem = cellShapes.size();
|
|
||||||
|
|
||||||
if (cellShapes.size())
|
if (cellShapes.size())
|
||||||
{
|
{
|
||||||
// All the cellShapes have the same number of elements!
|
// All the cellShapes have the same number of elements!
|
||||||
|
|
|
@ -136,7 +136,7 @@ bool merge
|
||||||
const bool literalRE
|
const bool literalRE
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
auto bool wildCardInMergeDict = false;
|
bool wildCardInMergeDict = false;
|
||||||
|
|
||||||
bool changed = false;
|
bool changed = false;
|
||||||
|
|
||||||
|
|
|
@ -188,10 +188,6 @@ endOfSection {space}")"{space}
|
||||||
// Data index
|
// Data index
|
||||||
label curNEntriesPerObject = 0;
|
label curNEntriesPerObject = 0;
|
||||||
|
|
||||||
// Dummy, not used
|
|
||||||
label nTimeLevels;
|
|
||||||
label nPhases;
|
|
||||||
|
|
||||||
label curFirstID = 0;
|
label curFirstID = 0;
|
||||||
label curLastID = 0;
|
label curLastID = 0;
|
||||||
label objI = 0;
|
label objI = 0;
|
||||||
|
@ -320,8 +316,10 @@ endOfSection {space}")"{space}
|
||||||
nEntriesPerObject.append(curNEntriesPerObject);
|
nEntriesPerObject.append(curNEntriesPerObject);
|
||||||
|
|
||||||
// Dummy, not used
|
// Dummy, not used
|
||||||
nTimeLevels = readLabel(fieldDataStream);
|
//nTimeLevels =
|
||||||
nPhases = readLabel(fieldDataStream);
|
readLabel(fieldDataStream);
|
||||||
|
//nPhases =
|
||||||
|
readLabel(fieldDataStream);
|
||||||
|
|
||||||
// Start and end of list
|
// Start and end of list
|
||||||
curFirstID = readLabel(fieldDataStream);
|
curFirstID = readLabel(fieldDataStream);
|
||||||
|
|
|
@ -5433,6 +5433,10 @@ void dynamicTopoFvMesh::buildProcessorPatchMesh
|
||||||
// Check if this is a direct neighbour
|
// Check if this is a direct neighbour
|
||||||
const polyBoundaryMesh& boundary = boundaryMesh();
|
const polyBoundaryMesh& boundary = boundaryMesh();
|
||||||
|
|
||||||
|
/*
|
||||||
|
// unused code section - to be removed
|
||||||
|
// HR: 30/11/2013
|
||||||
|
|
||||||
label patchIndex = -1;
|
label patchIndex = -1;
|
||||||
|
|
||||||
forAll(boundary, patchI)
|
forAll(boundary, patchI)
|
||||||
|
@ -5447,11 +5451,11 @@ void dynamicTopoFvMesh::buildProcessorPatchMesh
|
||||||
if (pp.neighbProcNo() == proc)
|
if (pp.neighbProcNo() == proc)
|
||||||
{
|
{
|
||||||
patchIndex = patchI;
|
patchIndex = patchI;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// Add sub-mesh points first.
|
// Add sub-mesh points first.
|
||||||
// Additional halo points will be added later.
|
// Additional halo points will be added later.
|
||||||
|
|
|
@ -233,8 +233,7 @@ void eMesh::calcEdgePoints() const
|
||||||
// Counter-clockwise. Pick the owner.
|
// Counter-clockwise. Pick the owner.
|
||||||
cellIndex = owner[faceIndex];
|
cellIndex = owner[faceIndex];
|
||||||
}
|
}
|
||||||
else
|
else if (mesh_.isInternalFace(faceIndex))
|
||||||
if (mesh_.isInternalFace(faceIndex))
|
|
||||||
{
|
{
|
||||||
// Clockwise. Pick the neighbour.
|
// Clockwise. Pick the neighbour.
|
||||||
cellIndex = neighbour[faceIndex];
|
cellIndex = neighbour[faceIndex];
|
||||||
|
@ -260,7 +259,8 @@ void eMesh::calcEdgePoints() const
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
faceIndex = cellToCheck[0];
|
faceIndex = cellToCheck[0];
|
||||||
found = true; break;
|
found = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if
|
if
|
||||||
|
@ -270,7 +270,8 @@ void eMesh::calcEdgePoints() const
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
faceIndex = cellToCheck[1];
|
faceIndex = cellToCheck[1];
|
||||||
found = true; break;
|
found = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if
|
if
|
||||||
|
@ -280,7 +281,8 @@ void eMesh::calcEdgePoints() const
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
faceIndex = cellToCheck[2];
|
faceIndex = cellToCheck[2];
|
||||||
found = true; break;
|
found = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if
|
if
|
||||||
|
@ -290,7 +292,8 @@ void eMesh::calcEdgePoints() const
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
faceIndex = cellToCheck[3];
|
faceIndex = cellToCheck[3];
|
||||||
found = true; break;
|
found = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,6 +311,9 @@ void eMesh::calcEdgePoints() const
|
||||||
<< "edgeFaces: " << eFace
|
<< "edgeFaces: " << eFace
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
}
|
}
|
||||||
|
# else
|
||||||
|
// dummy statement to quech compiler warning
|
||||||
|
found = found;
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,7 +190,7 @@ void Foam::multiSolver::synchronizeParallel() const
|
||||||
// Recieve go signal
|
// Recieve go signal
|
||||||
{
|
{
|
||||||
IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
|
IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
|
||||||
bool okayToGo(readBool(fromMaster));
|
readBool(fromMaster);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -309,8 +309,8 @@ List<specieElement> currentSpecieComposition(5);
|
||||||
scalar currentLowT = 0;
|
scalar currentLowT = 0;
|
||||||
scalar currentHighT = 0;
|
scalar currentHighT = 0;
|
||||||
scalar currentCommonT = 0;
|
scalar currentCommonT = 0;
|
||||||
gasThermoPhysics::coeffArray highCpCoeffs;
|
gasThermoPhysics::coeffArray highCpCoeffs(scalarList(7));
|
||||||
gasThermoPhysics::coeffArray lowCpCoeffs;
|
gasThermoPhysics::coeffArray lowCpCoeffs(scalarList(7));
|
||||||
|
|
||||||
gasReaction::specieCoeffs currentSpecieCoeff;
|
gasReaction::specieCoeffs currentSpecieCoeff;
|
||||||
|
|
||||||
|
|
|
@ -209,7 +209,7 @@ endsolid {space}("endsolid"|"ENDSOLID")({some_space}{word})*
|
||||||
|
|
||||||
%{
|
%{
|
||||||
// End of read character pointer returned by strtof
|
// End of read character pointer returned by strtof
|
||||||
char* endPtr;
|
//char* endPtr;
|
||||||
|
|
||||||
STLpoint normal;
|
STLpoint normal;
|
||||||
STLpoint vertex;
|
STLpoint vertex;
|
||||||
|
|
Reference in a new issue