diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 6a01fac5f92314b9fd2f5fb1aff34be4fb400b08..041a64de4f0989ff996f20e4a3eb95481945d97f 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 263f2534e223245e408764ef8323f747ee3aac10..39f0de363a3988b913737c06ca9e838ae742afa9 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 ea650ad98a86811953f1c121ddf173b848126cff..1d6bc65284160f594c3275623cf4a215b584d852 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 22bbb4002b9def3a14a7f6eb123e46e4fbfffda3..75ab79ec86b2e786c1e5aeffe0af02d64bfc05bf 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 f028ac227a09840a2391665957fadadbfba36717..a30383462355284a3dde2d3c04b02034680c595a 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 939c75658309bdab1755ecdd25ed49b07b7765f4..c906ec89eb28811a1ebeeeea84479c7a235b7048 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 3c3f01de93fe743590fb4f17316c049be4317d4e..c4e6b21162333db17eb973a51f5a75934cfa8693 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 9f27b82cb5e7d44db165e146eef9a86251ed0a3b..73f34b0f85f190348d7b3b89bc9b39acd5ce761f 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 be7f7d631d3092c6fdffcb40349c53ba1fff4db8..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 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 db2e26ca8b94e9e522bd34952181e5e0aa00d780..1adeeefa12999bb91513d9e0b16a0a52a9fc15d2 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 db2e26ca8b94e9e522bd34952181e5e0aa00d780..1adeeefa12999bb91513d9e0b16a0a52a9fc15d2 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 03c890ea5ee3f1a49be2c99c4445539089d84e6d..7d09e7e83ffe6f26ca0ce8202a84231236a8bf84 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 e73c6a9fc71eab8eccfb5e0cce1719271fbea12f..f5285ce39e8371795f0ee29990683684c685b68b 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 ae2f65366688f2e1ffbe6f6ebf28abb0b15d15b3..f67d6a42542e5d57912090f1683f590a3aa23b1b 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 c4734b6ca14bba74d52ae3275c873ca480848684..d38cd8b1801b429e5f42c7b0ba2ab58ba2cd1d11 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 be7f7d631d3092c6fdffcb40349c53ba1fff4db8..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 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 be7f7d631d3092c6fdffcb40349c53ba1fff4db8..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 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 083d04c7a6724b1099fcb35b9b8526573503c7ba..04b22c08a43668605ad1f5dab7bc06f0a962e058 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 083d04c7a6724b1099fcb35b9b8526573503c7ba..04b22c08a43668605ad1f5dab7bc06f0a962e058 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 be7f7d631d3092c6fdffcb40349c53ba1fff4db8..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 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 e5b31a6ffad662a1a70b7ccee7b297e0c8b40b2d..47f63723e30021bb3c2cfa9adf327f7e0981cbc4 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 1d4ee22b138cb1868ad03e0046874f14b61e87c9..149b58cc98164c981b69f0421d13cf80470f24ca 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 84844ed6824f5c1942aaae05829280fb323d6464..47f63723e30021bb3c2cfa9adf327f7e0981cbc4 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 fbc31ea0a353229a789b35e206e74a15eee61d5a..635142c6cca869fbcf2066cc1b3bb513592843b7 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 be7f7d631d3092c6fdffcb40349c53ba1fff4db8..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 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 f967261d26daf8e8faa04a6086f698c93c33e04c..b0e647e10a1e3ef1f41e11bce4758f9dbd53c759 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 55c37f7066e0b88e8b7c43a3ece8cd4460dad437..49c8ba9144d9ef7e1c05dbda2192a64177342aa8 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 f967261d26daf8e8faa04a6086f698c93c33e04c..b0e647e10a1e3ef1f41e11bce4758f9dbd53c759 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 1e34f1edfec7c841ad44e8ce40084622923561e4..cb15a51f9ab66a32858d61b076221ec8d8e796b5 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 f967261d26daf8e8faa04a6086f698c93c33e04c..b0e647e10a1e3ef1f41e11bce4758f9dbd53c759 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 dbd92d3a86d95ae24fe0b752424467144ccb1a6f..89b81846dac124fa0ca613034169be83ac94fd25 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 c9b435cc2b4f90d9e219863e2afddcfa2f2ea9c7..634c3c7467d328ab857eac0067aec55595cdbae6 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