From 47996ef1863b2f5002c50e0ad6f74bc8652b3e0b Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 11 Jun 2008 15:55:07 +0100
Subject: [PATCH] Removed all warnings from gcc-4.3.0 except those from
NamedEnum (bug in compiler?) molecule (Graham dealing with it) lex (no
comment) VTK (again no comment)
---
.../advanced/autoRefineMesh/autoRefineMesh.C | 12 +++++----
.../refinementLevel/refinementLevel.C | 17 ++++++------
.../mesh/conversion/ansysToFoam/ansysToFoam.L | 3 ++-
.../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 6 +++--
.../fluentMeshToFoam/fluentMeshToFoam.L | 3 ++-
.../conversion/gambitToFoam/gambitToFoam.L | 3 ++-
.../manipulation/Optional/setSet/setSet.C | 12 ++++-----
.../reconstructParMesh/Make/options | 3 +--
.../foamDataToFluent/Make/options | 3 +--
.../dataConversion/foamToEnsight/Make/options | 3 +--
.../foamToFieldview9/Make/options | 3 +--
.../dataConversion/foamToVTK/Make/options | 4 +--
.../graphics/fieldview9Reader/Make/options | 9 +++----
.../execFlowFunctionObjects/Make/options | 1 -
.../miscellaneous/postChannel/Make/options | 3 +--
.../miscellaneous/ptot/Make/options | 3 +--
.../miscellaneous/wdot/Make/options | 3 +--
.../sampling/probeLocations/Make/options | 2 +-
.../sampling/sample/Make/options | 2 +-
.../scalarField/pPrime2/Make/options | 3 +--
.../stressField/stressComponents/Make/options | 3 +--
.../postProcessing/turbulence/R/Make/options | 3 +--
.../createTurbulenceFields/Make/options | 2 +-
.../velocityField/Mach/Make/options | 1 -
.../velocityField/streamFunction/Make/options | 3 +--
.../wall/wallGradU/Make/options | 3 +--
.../wall/wallHeatFlux/Make/options | 3 +--
.../wall/wallShearStress/Make/options | 3 +--
.../postProcessing/wall/yPlusLES/Make/options | 3 +--
.../postProcessing/wall/yPlusRAS/Make/options | 3 +--
.../surfaceCoarsen/bunnylod/progmesh.C | 26 +++++++++----------
.../reaction/Reactions/Reaction/Reaction.H | 8 ++++--
32 files changed, 75 insertions(+), 84 deletions(-)
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 6a01fac5f92..041a64de4f0 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -451,7 +451,7 @@ void doRefinement
const labelHashSet& refCells,
labelList& refLevel
)
-{
+{
label oldCells = mesh.nCells();
// Multi-iteration, multi-direction topology modifier.
@@ -565,7 +565,7 @@ void subsetMesh
// Update cutCells for removed cells.
cutCells.updateMesh(morphMap());
}
-
+
// Divide the cells according to status compared to surface. Constructs sets:
// - cutCells : all cells cut by surface
@@ -877,7 +877,7 @@ int main(int argc, char *argv[])
// Added cells from 2:1 refinement level restriction.
- while
+ while
(
limitRefinementLevel
(
@@ -887,7 +887,8 @@ int main(int argc, char *argv[])
refLevel,
cutCells
)
- );
+ )
+ {}
Info<< " Current cells : " << mesh.nCells() << nl
@@ -988,7 +989,8 @@ int main(int argc, char *argv[])
refLevel,
hanging
)
- );
+ )
+ {}
doRefinement(mesh, refineDict, hanging, refLevel);
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 263f2534e22..39f0de363a3 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -26,12 +26,12 @@ Description
Tries to figure out what the refinement level is on refined cartesian
meshes. Run BEFORE snapping.
- Writes
+ Writes
- volScalarField 'refinementLevel' with current refinement level.
- cellSet 'refCells' which are the cells that need to be refined to satisfy
2:1 refinement.
- Works by dividing cells into volume bins.
+ Works by dividing cells into volume bins.
\*---------------------------------------------------------------------------*/
@@ -77,7 +77,7 @@ bool limitRefinementLevel
}
}
}
-
+
if (refCells.size() > oldNCells)
{
Info<< "Added an additional " << refCells.size() - oldNCells
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
<< lowerLimits[lowerLimits.size()-1] << " .. "
<< upperLimits[upperLimits.size()-1] << endl;
- // Create new bin.
+ // Create new bin.
bins.append(DynamicList<label>());
lowerLimits.append(sortedVols[i]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
return 1;
}
-
+
labelIOList refLevel
(
IOobject
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
bField[faceI] = postRefLevel[own];
}
}
-
+
Info<< "Determined current refinement level and writing to "
<< postRefLevel.name() << " (as volScalarField; for post processing)"
<< nl
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
// Cells to refine
cellSet refCells(mesh, "refCells", 100);
- while
+ while
(
limitRefinementLevel
(
@@ -333,7 +333,8 @@ int main(int argc, char *argv[])
refLevel, // current refinement level
refCells // cells to refine
)
- );
+ )
+ {}
if (refCells.size() > 0)
{
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index ea650ad98a8..1d6bc652841 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -265,7 +265,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&ansysStream);
- while(lexer.yylex() != 0);
+ while(lexer.yylex() != 0)
+ {}
Info << "Creating points" << endl;
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 22bbb4002b9..75ab79ec86b 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -583,7 +583,8 @@ endOfSection {space}")"{space}
<readCellData>{spaceNl}{lbrac} {
// Quickly scan to the end of the cell data block and discard
register int c;
- while ((c = yyinput()) != 0 && c != ')');
+ while ((c = yyinput()) != 0 && c != ')')
+ {}
}
{faceTree} {
@@ -763,7 +764,8 @@ int main(int argc, char *argv[])
yyFlexLexer lexer(&fluentStream.stdStream());
- while(lexer.yylex() != 0);
+ while(lexer.yylex() != 0)
+ {}
Info<< "\nFINISHED LEXING\n\n";
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index f028ac227a0..a3038346235 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -901,7 +901,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&fluentStream);
- while(lexer.yylex() != 0);
+ while(lexer.yylex() != 0)
+ {}
Info<< "\n\nFINISHED LEXING\n\n\n";
// Lookup table giving number of vertices given a fluent cell type ID
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 939c7565830..c906ec89eb2 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -665,7 +665,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&gambitStream);
- while(lexer.yylex() != 0);
+ while(lexer.yylex() != 0)
+ {}
Info << "Finished lexing" << endl;
diff --git a/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C b/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C
index 3c3f01de93f..c4e6b211623 100644
--- a/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C
@@ -189,7 +189,7 @@ void writeVTK
faceList setFaces(cellFaces.size());
labelList faceValues(cellFaces.size());
label setFaceI = 0;
-
+
forAllConstIter(Map<label>, cellFaces, iter)
{
setFaces[setFaceI] = mesh.faces()[iter.key()];
@@ -217,7 +217,7 @@ void writeVTK
mesh,
currentSet,
mesh.time().path()/vtkName
- );
+ );
}
else
{
@@ -331,7 +331,7 @@ bool doCommand
// Get some size estimate for set.
const globalMeshData& parData = mesh.globalData();
- label typSize =
+ label typSize =
max
(
parData.nTotalCells(),
@@ -449,7 +449,7 @@ bool doCommand
}
}
else
- {
+ {
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
@@ -743,7 +743,7 @@ int main(int argc, char *argv[])
else if (!read_history(historyFile))
{
Info<< "Successfully read history from " << historyFile << endl;
- }
+ }
#endif
@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
FatalError.throwExceptions();
FatalIOError.throwExceptions();
- while (1)
+ do
{
string rawLine;
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
index 9f27b82cb5e..73f34b0f85f 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-ldynamicMesh \
- -lmeshTools \
-
+ -lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
index be7f7d631d3..fa15f124528 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
index db2e26ca8b9..1adeeefa129 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -llagrangian \
-
+ -llagrangian
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/Make/options b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/Make/options
index db2e26ca8b9..1adeeefa129 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/Make/options
@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -llagrangian \
-
+ -llagrangian
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
index 03c890ea5ee..7d09e7e83ff 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
@@ -6,5 +6,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-llagrangian \
- -lmeshTools \
-
+ -lmeshTools
+
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options b/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
index e73c6a9fc71..f5285ce39e8 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
@@ -24,7 +24,7 @@
-lgen -lnsl -lsocket -lw -lintl -ldl
#elif defined(sgiN32) || defined(sgiN32Gcc)
-
+
FV_LIBS = \
$(FV_HOME)/user/obj/iris/fv.o \
$(FV_HOME)/user/obj/iris/fv2.o \
@@ -94,12 +94,9 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/browser/lnInclude \
- -I$(FOAM_SRC)/lagrangian/basic/lnInclude \
-
+ -I$(FOAM_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
$(FV_LIBS) \
-lfiniteVolume \
- -lmeshTools \
-
-
+ -lmeshTools
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index ae2f6536668..f67d6a42542 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -17,4 +17,3 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleLESmodels
-
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
index c4734b6ca14..d38cd8b1801 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lsampling \
-
+ -lsampling
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/Make/options b/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
index be7f7d631d3..fa15f124528 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/Make/options b/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
index be7f7d631d3..fa15f124528 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/Make/options b/applications/utilities/postProcessing/sampling/probeLocations/Make/options
index 083d04c7a67..04b22c08a43 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/Make/options
+++ b/applications/utilities/postProcessing/sampling/probeLocations/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options
index 083d04c7a67..04b22c08a43 100644
--- a/applications/utilities/postProcessing/sampling/sample/Make/options
+++ b/applications/utilities/postProcessing/sampling/sample/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/Make/options b/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
index be7f7d631d3..fa15f124528 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
index e5b31a6ffad..47f63723e30 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@@ -6,5 +6,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-
+ -lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 1d4ee22b138..149b58cc981 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -7,5 +7,4 @@ EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 84844ed6824..47f63723e30 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -6,4 +6,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
+ -lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Make/options b/applications/utilities/postProcessing/velocityField/Mach/Make/options
index fbc31ea0a35..635142c6cca 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Mach/Make/options
@@ -8,4 +8,3 @@ EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie
-
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/Make/options b/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
index be7f7d631d3..fa15f124528 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options
index f967261d26d..b0e647e10a1 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@@ -6,5 +6,4 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 55c37f7066e..49c8ba9144d 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -10,5 +10,4 @@ EXE_LIBS = \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \
- -lbasicThermophysicalModels \
-
+ -lbasicThermophysicalModels
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index f967261d26d..b0e647e10a1 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -6,5 +6,4 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index 1e34f1edfec..cb15a51f9ab 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -7,5 +7,4 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleLESmodels \
-lincompressibleTransportModels \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index f967261d26d..b0e647e10a1 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -6,5 +6,4 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
-
+ -lfiniteVolume
diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
index dbd92d3a86d..89b81846dac 100644
--- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
+++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
@@ -7,7 +7,7 @@
* See the header file progmesh.h for a description of this module
*/
-#include <stdio.h>
+#include <stdio.h>
#include <math.h>
#include <stdlib.h>
#include <assert.h>
@@ -151,11 +151,11 @@ void Vertex::RemoveIfNonNeighbor(Vertex *n) {
float ComputeEdgeCollapseCost(Vertex *u,Vertex *v) {
- // if we collapse edge uv by moving u to v then how
+ // if we collapse edge uv by moving u to v then how
// much different will the model change, i.e. how much "error".
// Texture, vertex normal, and border vertex code was removed
// to keep this demo as simple as possible.
- // The method of determining cost was designed in order
+ // The method of determining cost was designed in order
// to exploit small and coplanar regions for
// effective polygon reduction.
// Is is possible to add some checks here to see if "folds"
@@ -173,7 +173,7 @@ float ComputeEdgeCollapseCost(Vertex *u,Vertex *v) {
sides.Add(u->face[i]);
}
}
- // use the triangle facing most away from the sides
+ // use the triangle facing most away from the sides
// to determine our curvature term
for(i=0;i<u->face.num;i++) {
float mincurv=1; // curve for face i and closer side to it
@@ -184,7 +184,7 @@ float ComputeEdgeCollapseCost(Vertex *u,Vertex *v) {
}
curvature = max(curvature,mincurv);
}
- // the more coplanar the lower the curvature term
+ // the more coplanar the lower the curvature term
return edgelength * curvature;
}
@@ -193,7 +193,7 @@ void ComputeEdgeCostAtVertex(Vertex *v) {
// from vertex v. Since we are only interested in reducing
// the object by selecting the min cost edge at each step, we
// only cache the cost of the least cost edge at this vertex
- // (in member variable collapse) as well as the value of the
+ // (in member variable collapse) as well as the value of the
// cost (in member variable objdist).
if(v->neighbor.num==0) {
// v doesn't have neighbors so it costs nothing to collapse
@@ -247,7 +247,7 @@ void Collapse(Vertex *u,Vertex *v){
for(i=u->face.num-1;i>=0;i--) {
u->face[i]->ReplaceVertex(u,v);
}
- delete u;
+ delete u;
// recompute the edge collapse costs for neighboring vertices
for(i=0;i<tmp.num;i++) {
ComputeEdgeCostAtVertex(tmp[i]);
@@ -256,15 +256,15 @@ void Collapse(Vertex *u,Vertex *v){
void AddVertex(List<Vector> &vert){
for(int i=0;i<vert.num;i++) {
- Vertex *v = new Vertex(vert[i],i);
+ new Vertex(vert[i],i);
}
}
void AddFaces(List<tridata> &tri){
for(int i=0;i<tri.num;i++) {
- Triangle *t=new Triangle(
- vertices[tri[i].v[0]],
- vertices[tri[i].v[1]],
- vertices[tri[i].v[2]] );
+ new Triangle(
+ vertices[tri[i].v[0]],
+ vertices[tri[i].v[1]],
+ vertices[tri[i].v[2]] );
}
}
@@ -284,7 +284,7 @@ Vertex *MinimumCostEdge(){
return mn;
}
-void ProgressiveMesh(List<Vector> &vert, List<tridata> &tri,
+void ProgressiveMesh(List<Vector> &vert, List<tridata> &tri,
List<int> &map, List<int> &permutation)
{
AddVertex(vert); // put input data into our data structures
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index c9b435cc2b4..634c3c7467d 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -81,6 +81,10 @@ public:
scalar exponent;
specieCoeffs()
+ :
+ index(-1),
+ stoichCoeff(0),
+ exponent(1)
{}
specieCoeffs(const speciesTable& species, Istream& is);
@@ -157,7 +161,7 @@ public:
{
const speciesTable& species_;
const HashPtrTable<ReactionThermo>& thermoDatabase_;
-
+
public:
iNew
@@ -257,7 +261,7 @@ public:
const scalar T,
const scalar p,
const scalarField& c
- ) const;
+ ) const;
//- Reverse rate constant from the given forward rate constant
virtual scalar kr
--
GitLab