Merge commit 'origin/master' into olesenm

2025-11-28 03:28:01 +00:00 · 2008-06-12 08:28:32 +02:00
parent e7a33edc7d 68ab71fab1
commit 5102a2bc28
33 changed files with 77 additions and 85 deletions
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@ -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);

--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@ -333,7 +333,8 @@ int main(int argc, char *argv[])
            refLevel,       // current refinement level
            refCells        // cells to refine
        )
-    );
+    )
+    {}

    if (refCells.size() > 0)
    {
--- 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;

--- 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";

--- 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
--- 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;

--- a/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C
@ -754,7 +754,7 @@ int main(int argc, char *argv[])
    FatalError.throwExceptions();
    FatalIOError.throwExceptions();

-    while (1)
+    do
    {
        string rawLine;

--- 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
--- 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
--- 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
--- 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
--- 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

--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
@ -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
--- 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
-
--- 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
--- 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
--- 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
--- 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 \
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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
-
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
+++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
@ -256,12 +256,12 @@ 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(
+		new Triangle(
            vertices[tri[i].v[0]],
            vertices[tri[i].v[1]],
            vertices[tri[i].v[2]] );
--- a/bin/doxyScr
+++ b/bin/doxyScr
@ -131,7 +131,8 @@ s/^    //

 /SourceFiles/,/^[ ]*$/{
 s?SourceFiles?@par Source files\
-<ul>?
+<ul>\
+  <li><a href="%filePath%">%fileName%</a></li>?
 s?^[ ]*$?</ul>\
 ?
 s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
--- 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);