Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

etc/thermoData/thermoData

@@ -18621,7 +18621,7 @@ T_Tritium__(g)
     specie
     {
         nMoles          1;
-        molWeight       47.9;
+        molWeight       3.016;
     }
     thermodynamics
     {

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ void Foam::polyPatch::movePoints(PstreamBuffers&, const pointField& p)
 
 void Foam::polyPatch::updateMesh(PstreamBuffers&)
 {
+    primitivePatch::clearGeom();
     clearAddressing();
-    primitivePatch::clearOut();
 }
 
 
@@ -348,6 +348,8 @@ const Foam::labelList& Foam::polyPatch::meshEdges() const
 
 void Foam::polyPatch::clearAddressing()
 {
+    primitivePatch::clearTopology();
+    primitivePatch::clearPatchMeshAddr();
     deleteDemandDrivenData(faceCellsPtr_);
     deleteDemandDrivenData(mePtr_);
 }

src/OpenFOAM/primitives/Tensor/tensor/tensor.C

@@ -150,7 +150,7 @@ Foam::vector Foam::eigenValues(const tensor& t)
             if (R2 < Q3)
             {
                 scalar sqrtQ = sqrt(Q);
-                scalar theta = acos(R/(Q*sqrtQ));
+                scalar theta = acos(min(1.0, max(-1.0, R/(Q*sqrtQ))));
 
                 scalar m2SqrtQ = -2*sqrtQ;
                 scalar aBy3 = a/3;
@@ -344,7 +344,7 @@ Foam::vector Foam::eigenValues(const symmTensor& t)
             if (R2 < Q3)
             {
                 scalar sqrtQ = sqrt(Q);
-                scalar theta = acos(R/(Q*sqrtQ));
+                scalar theta = acos(min(1.0, max(-1.0, R/(Q*sqrtQ))));
 
                 scalar m2SqrtQ = -2*sqrtQ;
                 scalar aBy3 = a/3;

src/Pstream/mpi/UPstream.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,7 +286,7 @@ void Foam::reduce
         Pout<< "UPstream::allocateRequest for non-blocking reduce"
             << " : request:" << requestID
             << endl;
-
+    }
 #else
     // Non-blocking not yet implemented in mpi
     reduce(Value, bop, tag, communicator);

src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C

@@ -46,15 +46,6 @@ wedgeFvPatch::wedgeFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::vectorField> Foam::wedgeFvPatch::delta() const
-{
-    const vectorField nHat(nf());
-    return nHat*(nHat & (Cf() - Cn()));
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H

@@ -83,9 +83,6 @@ public:
             {
                 return wedgePolyPatch_.cellT();
             }
-
-            //- Return cell-centre to face normal vector
-            virtual tmp<vectorField> delta() const;
 };
 
 

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C

@@ -140,7 +140,9 @@ const Foam::scalarField& Foam::fvPatch::magSf() const
 
 Foam::tmp<Foam::vectorField> Foam::fvPatch::delta() const
 {
-    return Cf() - Cn();
+    // Use patch-normal delta for all non-coupled BCs
+    const vectorField nHat(nf());
+    return nHat*(nHat & (Cf() - Cn()));
 }
 
 

src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C

@@ -103,8 +103,12 @@ bool Foam::trackedParticle::move
     scalar tEnd = (1.0 - stepFraction())*trackTime;
     scalar dtMax = tEnd;
 
-    if (tEnd <= SMALL)
+    if (tEnd <= SMALL && onBoundary())
     {
+        // This is a hack to handle particles reaching their endpoint
+        // on a processor boundary. If the endpoint is on a processor face
+        // it currently gets transferred backwards and forwards infinitely.
+
         // Remove the particle
         td.keepParticle = false;
     }

src/thermophysicalModels/specie/atomicWeights/atomicWeights.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,8 @@ Foam::atomicWeightTable::atomicWeights[atomicWeightTable::nElements] =
     {"Es", 254.00000},
     {"Fm", 253.00000},
     {"D",    2.01410},
-    {"e",    5.45e-4}
+    {"e",    5.45e-4},
+    {"T",    3.01604}
 };
 
 

src/thermophysicalModels/specie/atomicWeights/atomicWeights.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ public:
             scalar weight;
         };
 
-        static const int nElements = 103;
+        static const int nElements = 104;
 
         //- Static table of the weights of all known elements
         static const atomicWeight atomicWeights[nElements];