Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C

applications/utilities/mesh/conversion/sammToFoam/readPoints.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/mesh/conversion/star3ToFoam/readPoints.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,6 @@ void starMesh::readPoints(const scalar scaleFactor)
         if (pointsFile.good())
         {
             label pointLabel;
-            scalar x, y, z;
 
             maxLabel = -1;
             while (pointsFile)
@@ -97,9 +96,9 @@ void starMesh::readPoints(const scalar scaleFactor)
 
                 maxLabel = max(maxLabel, pointLabel);
 
-                x = readVtxCmpt(pointsFile);
+                readVtxCmpt(pointsFile);
-                y = readVtxCmpt(pointsFile);
+                readVtxCmpt(pointsFile);
-                z = readVtxCmpt(pointsFile);
+                readVtxCmpt(pointsFile);
 
                 readToNl(pointsFile);
 

applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C

@@ -44,6 +44,7 @@ Description
 #include "meshTools.H"
 #include "cellSet.H"
 #include "faceSet.H"
+#include "SubField.H"
 
 using namespace Foam;
 

applications/utilities/mesh/manipulation/refineMesh/refineMesh.C

@@ -44,6 +44,7 @@ Description
 #include "labelIOList.H"
 #include "wedgePolyPatch.H"
 #include "plane.H"
+#include "SubField.H"
 
 using namespace Foam;
 

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -33,7 +33,6 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lIOFunctionObjects \
     -ljobControl \
-    -lkineticTheoryModel \
     -llagrangian \
     -llagrangianIntermediate \
     -llaminarFlameSpeedModels \

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -383,16 +383,12 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
 
                 forAll(quadFcs, quadI)
                 {
-                    label thisCellI;
-
                     if (substituteCell)
                     {
-                        thisCellI = cellI;
                         substituteCell = false;
                     }
                     else
                     {
-                        thisCellI = mesh.nCells() + addCellI;
                         superCells[addCellI++] = cellI;
                     }
 
@@ -430,16 +426,12 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
 
                 forAll(triFcs, triI)
                 {
-                    label thisCellI;
-
                     if (substituteCell)
                     {
-                        thisCellI = cellI;
                         substituteCell = false;
                     }
                     else
                     {
-                        thisCellI = mesh.nCells() + addCellI;
                         superCells[addCellI++] = cellI;
                     }
 

src/OpenFOAM/include/checkTimeOptions.H

@@ -2,11 +2,11 @@
 // checkTimeOptions.H
 // ~~~~~~~~~~~~~~~~~~
 
-    Foam::label startTime = 0;
+Foam::label startTime = 0;
-    Foam::label endTime = Times.size();
+Foam::label endTime = Times.size();
 
 // unless -constant is present, skip startTime if it is "constant"
-#   include "checkConstantOption.H"
+#include "checkConstantOption.H"
 
 // check -time and -latestTime options
-#   include "checkTimeOption.H"
+#include "checkTimeOption.H"

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C

@@ -24,6 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveMesh.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
 #include "demandDrivenData.H"
 #include "indexedOctree.H"
 #include "treeDataCell.H"

src/engine/ignition/ignitionSite.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ void Foam::ignitionSite::findIgnitionCells(const fvMesh& mesh)
     cellVolumes_[0] = vols[ignCell];
 
     scalar minDist = GREAT;
-    label nearestCell = 0;
     label nIgnCells = 1;
 
     forAll(centres, celli)
@@ -60,7 +59,6 @@ void Foam::ignitionSite::findIgnitionCells(const fvMesh& mesh)
 
         if (dist < minDist)
         {
-            nearestCell = celli;
             minDist = dist;
         }
 

src/lagrangian/basic/InteractionLists/InteractionLists.C

@@ -654,8 +654,6 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
     {
         List<label> permutationIndices(nTrans, 0);
 
-        vector s = vector::zero;
-
         if (nTrans == 0 && procI != Pstream::myProcNo())
         {
             treeBoundBox extendedReferredProcBb = allExtendedProcBbs[procI];

src/lagrangian/dieselSpray/parcel/parcel.C

@@ -440,7 +440,6 @@ void Foam::parcel::updateParcelProperties
     scalar oldhv = fuels.hl(pg, T(), X());
     scalar Np = N(oldDensity);
 
-    scalar newDensity = oldDensity;
     scalar newMass    = oldMass;
     scalar newhg      = oldhg;
     scalar newhv      = oldhv;
@@ -460,7 +459,6 @@ void Foam::parcel::updateParcelProperties
         // first time
         if (n > 1)
         {
-            newDensity = fuels.rho(pg, Tnew, X());
             newMass = m();
             newhg = 0.0;
             scalarField Ynew(fuels.Y(X()));

src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C

@@ -112,11 +112,10 @@ void Foam::LISA::atomizeParcel
     vector uDir = p.U()/mag(p.U());
 
     scalar uGas = mag(vel & uDir);
-    vector Ug = uGas*uDir;
 
     // Might be the relative velocity between Liquid and Gas, but using the
     // absolute velocity of the parcel as suggested by the authors
-//    scalar U = mag(p.Urel(vel));
+    // scalar U = mag(p.Urel(vel));
     scalar U = mag(p.U());
 
     p.ct() += deltaT;

src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C

@@ -118,9 +118,6 @@ void Foam::SHF::breakupParcel
     scalar reLiquid   = p.Re(rhoLiquid, vel, muLiquid);
     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);
 
     scalar weGasCorr = weGas/(1.0 + weCorrCoeff_*ohnesorge);

src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -246,9 +246,6 @@ void Foam::blobsSwirlInjector::calculateHX
             )
         );
 
-    scalar hOLD = -100.0;
-    scalar xOLD = -100.0;
-
     label i;
 
     for (i=0; i<20; i++)
@@ -267,10 +264,6 @@ void Foam::blobsSwirlInjector::calculateHX
             );
 
         x_ = sqr(1.0 - 2.0*h_/injectorDiameter);
-
-        hOLD = h_;
-        xOLD = x_;
-
     }
 
     x_ = sqr(1.0 - 2.0*h_/injectorDiameter);

src/mesh/blockMesh/blockMesh/blockMeshMerge.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -225,8 +225,6 @@ void Foam::blockMesh::calcMergeInfo()
         }
 
 
-        bool found = false;
-
         // N-squared point search over all points of all faces of
         // master block over all point of all faces of slave block
         forAll(blockPfaceFaces, blockPfaceFaceLabel)
@@ -240,8 +238,6 @@ void Foam::blockMesh::calcMergeInfo()
 
             forAll(blockPfaceFacePoints, blockPfaceFacePointLabel)
             {
-                found = false;
-
                 forAll(blockNfaceFaces, blockNfaceFaceLabel)
                 {
                     const labelList& blockNfaceFacePoints
@@ -261,7 +257,6 @@ void Foam::blockMesh::calcMergeInfo()
                         )
                         {
                             // Found a new pair
-                            found = true;
 
                             cp[blockPfaceFacePointLabel] =
                                 blockNfaceFacePoints[blockNfaceFacePointLabel];
@@ -332,7 +327,6 @@ void Foam::blockMesh::calcMergeInfo()
 
             const labelListList& curPairs = glueMergePairs[blockFaceLabel];
 
-            bool foundFace = false;
             label blockPfaceLabel;
             for
             (
@@ -347,14 +341,12 @@ void Foam::blockMesh::calcMergeInfo()
                  == blockInternalFaces[blockFaceLabel]
                 )
                 {
-                    foundFace = true;
                     break;
                 }
             }
 
 // FIXME? - there seems to be some logic missing here
 
-            foundFace = false;
             label blockNfaceLabel;
             for
             (
@@ -369,7 +361,6 @@ void Foam::blockMesh::calcMergeInfo()
                  == blockInternalFaces[blockFaceLabel]
                 )
                 {
-                    foundFace = true;
                     break;
                 }
             }

src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C

@@ -2958,7 +2958,6 @@ char *timestring ( void )
 # define TIME_SIZE 29
 
   const struct tm *tm;
-  size_t len;
   time_t now;
   char *s;
 
@@ -2967,7 +2966,7 @@ char *timestring ( void )
 
   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;
 # undef TIME_SIZE

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,20 +83,15 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
 ) const
 {
     vector refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0);
-
     vector oldDir = refQ_ & refDir;
-
     vector newDir = motion.orientation() & refDir;
 
     if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
     {
         // Directions getting close to the axis, change reference
-
         refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
-
+        oldDir = refQ_ & refDir;
-        vector oldDir = refQ_ & refDir;
+        newDir = motion.orientation() & refDir;
-
-        vector newDir = motion.orientation() & refDir;
     }
 
     // Removing any axis component from oldDir and newDir and normalising

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,6 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
     vector refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0);
 
     vector oldDir = refQ_ & refDir;
-
     vector newDir = motion.orientation() & refDir;
 
     if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
@@ -96,9 +95,8 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
 
         refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
 
-        vector oldDir = refQ_ & refDir;
+        oldDir = refQ_ & refDir;
-
+        newDir = motion.orientation() & refDir;
-        vector newDir = motion.orientation() & refDir;
     }
 
     // Removing any axis component from oldDir and newDir and normalising

tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict

@@ -30,7 +30,7 @@ vertices
 
 blocks
 (
-    hex (0 1 2 3 4 5 6 7) (15 15 9) simpleGrading (1 1 1)
+    hex (0 1 2 3 4 5 6 7) (20 16 12) simpleGrading (1 1 1)
 );
 
 edges

tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict

@@ -42,16 +42,6 @@ geometry
         centre (0 0 -0.012);
         radius 0.003;
     }
-
-    //- Refine a bit extra around the edge of the flange. With only two cells
-    //  across it might/might not mesh correctly.
-    refineCap
-    {
-        type searchableCylinder;
-        point1 (0 0.021 -0.01075);
-        point2 (0 0.025 -0.01075);
-        radius 0.013;
-    }
 };
 
 
@@ -144,11 +134,6 @@ castellatedMeshControls
             mode inside;
             levels ((1E15 3));
         }
-        refineCap
-        {
-            mode inside;
-            levels ((1E15 3));
-        }
     }