Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

applications/utilities/parallelProcessing/reconstructPar/reconstructPar.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
@@ -198,6 +198,13 @@ int main(int argc, char *argv[])
         args
     );
 
+    // Note that we do not set the runTime time so it is still the
+    // one set through the controlDict. The -time option
+    // only affects the selected set of times from processor0.
+    // - can be illogical
+    // + any point motion handled through mesh.readUpdate
+
+
     if (timeDirs.empty())
     {
         FatalErrorIn(args.executable())

src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C

@@ -1460,41 +1460,47 @@ void Foam::extendedEdgeMesh::writeStats(Ostream& os) const
 {
     edgeMesh::writeStats(os);
 
-    os  << indent << "point classification (size and offset) :" << nl;
+    os  << indent << "point classification :" << nl;
     os  << incrIndent;
     os  << indent << "convex feature points          : "
         << setw(8) << concaveStart_-convexStart_
-        << setw(8) << convexStart_ << nl;
+        //<< setw(8) << convexStart_
+        << nl;
     os  << indent << "concave feature points         : "
         << setw(8) << mixedStart_-concaveStart_
-        << setw(8) << concaveStart_ << nl;
+        //<< setw(8) << concaveStart_
+        << nl;
     os  << indent << "mixed feature points           : "
         << setw(8) << nonFeatureStart_-mixedStart_
-        << setw(8) << mixedStart_ << nl;
+        //<< setw(8) << mixedStart_
+        << nl;
     os  << indent << "other (non-feature) points     : "
         << setw(8) << points().size()-nonFeatureStart_
-        << setw(8) << nonFeatureStart_ << nl;
+        //<< setw(8) << nonFeatureStart_
+        << nl;
     os  << decrIndent;
 
-    os  << indent << "edge classification (size and offset) :" << nl;
+    os  << indent << "edge classification :" << nl;
     os  << incrIndent;
     os  << indent << "external (convex angle) edges  : "
         << setw(8) << internalStart_-externalStart_
-        << setw(8) << externalStart_
+        //<< setw(8) << externalStart_
         << nl;
     os  << indent << "internal (concave angle) edges : "
         << setw(8) << flatStart_-internalStart_
-        << setw(8) << internalStart_
+        //<< setw(8) << internalStart_
         << nl;
     os  << indent << "flat region edges              : "
         << setw(8) << openStart_-flatStart_
-        << setw(8) << flatStart_ << nl;
+        //<< setw(8) << flatStart_
+        << nl;
     os  << indent << "open edges                     : "
         << setw(8) << multipleStart_-openStart_
-        << setw(8) << openStart_ << nl;
+        //<< setw(8) << openStart_
+        << nl;
     os  << indent << "multiply connected edges       : "
         << setw(8) << edges().size()-multipleStart_
-        << setw(8) << multipleStart_
+        //<< setw(8) << multipleStart_
         << nl;
     os  << decrIndent;
 }

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C

@@ -1375,14 +1375,14 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
                 patchAttraction[pointI] = rawPatchAttraction[pointI];
                 patchConstraints[pointI] = rawPatchConstraints[pointI];
 
-                if (multiPatchStr.valid())
+                //if (multiPatchStr.valid())
-                {
+                //{
-                    Pout<< "Adding constraint on multiPatchPoint:"
+                //    Pout<< "Adding constraint on multiPatchPoint:"
-                        << pp.localPoints()[pointI]
+                //        << pp.localPoints()[pointI]
-                        << " constraint:" << patchConstraints[pointI]
+                //        << " constraint:" << patchConstraints[pointI]
-                        << " attraction:" << patchAttraction[pointI]
+                //        << " attraction:" << patchAttraction[pointI]
-                        << endl;
+                //        << endl;
-                }
+                //}
             }
         }
     }
@@ -2153,6 +2153,28 @@ void Foam::autoSnapDriver::determineFeatures
                         );
                     }
                 }
+                else
+                {
+                    // No multi-patch snapping
+                    nearInfo = findNearFeaturePoint
+                    (
+                        false,              // isRegionPoint
+                        pp,
+                        snapDist,
+                        pointI,
+                        estimatedPt,
+
+                        // Feature-point to pp point
+                        pointAttractor,
+                        pointConstraints,
+                        // Feature-edge to pp point
+                        edgeAttractors,
+                        edgeConstraints,
+                        // pp point to nearest feature
+                        patchAttraction,
+                        patchConstraints
+                    );
+                }
 
                 const pointIndexHit& info = nearInfo.second();
                 if (info.hit() && featurePointStr.valid())

src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.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
@@ -837,6 +837,7 @@ void Foam::mappedPatchBase::calcAMI() const
             surfPtr(),
             faceAreaIntersect::tmMesh,
             AMIPatchToPatchInterpolation::imFaceAreaWeight,
+            -1,
             AMIReverse_
         )
     );

src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.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
@@ -92,6 +92,7 @@ void Foam::regionCoupledBase::resetAMI() const
                 surfPtr(),
                 faceAreaIntersect::tmMesh,
                 AMIPatchToPatchInterpolation::imFaceAreaWeight,
+                -1,
                 AMIReverse_
             )
         );

src/regionModels/regionModel/regionModel/regionModel.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
@@ -243,6 +243,7 @@ Foam::regionModels::regionModel::interRegionAMI
                     nbrP,
                     faceAreaIntersect::tmMesh,
                     AMIPatchToPatchInterpolation::imFaceAreaWeight,
+                    -1,
                     flip
                 )
             );
@@ -284,6 +285,7 @@ Foam::regionModels::regionModel::interRegionAMI
                 nbrP,
                 faceAreaIntersect::tmMesh,
                 AMIPatchToPatchInterpolation::imFaceAreaWeight,
+                -1,
                 flip
             )
         );

src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C

@@ -420,6 +420,7 @@ Foam::meshToMesh::patchAMIs() const
                     tgtPP,
                     faceAreaIntersect::tmMesh,
                     interpolationMethodAMI(method_),
+                    -1,
                     true // flip target patch since patch normals are aligned
                 )
             );

tutorials/mesh/foamyHexMesh/mixerVessel/0.org/alpha.phase1

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha.water;
+    object      alpha.phase1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/mesh/foamyHexMesh/mixerVessel/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Generate mesh
 ./Allrun-pre
 
-## Run simulation
+# Run simulation
 ./Allrun-simulation
 
 # ----------------------------------------------------------------- end-of-file

tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre

@@ -93,17 +93,17 @@ runParallel foamyHexMesh $nProcs
 runParallel collapseEdges $nProcs -collapseFaces -latestTime
 mv log.collapseEdges log.collapseFaces
 
-\cp system/collapseDict.indirectPatchFaces system/collapseDict
+#\cp system/collapseDict.indirectPatchFaces system/collapseDict
-runParallel collapseEdges $nProcs -collapseFaceSet indirectPatchFaces -latestTime
+#runParallel collapseEdges $nProcs -collapseFaceSet indirectPatchFaces -latestTime
-mv log.collapseEdges log.collapseFaceSet
+#mv log.collapseEdges log.collapseFaceSet
 
 runParallel checkMesh $nProcs -allTopology -allGeometry -latestTime
 
 runApplication reconstructParMesh -latestTime
 
 # Copy the mesh into polyMesh and delete the 102 directory
-\cp -r 102/polyMesh constant
+\cp -r 101/polyMesh constant
-\rm -rf 102
+\rm -rf 101
 
 
 # ----------------------------------------------------------------- end-of-file

tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties

@@ -15,16 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases (phase1 phase2);
 
-water
+phase1
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 300;
 }
 
-air
+phase2
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;

tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict

@@ -81,15 +81,8 @@ baffles
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
                 transform       noOrdering;
+                // Switch to zero-gradient for low weights
                 lowWeightCorrection 0.2;
-                // Note: since imperfect meshing around feature edge make
-                // sure to project both sides onto 'proper' geometry to
-                // avoid errors leading to zero weights
-                surface
-                {
-                    type        triSurfaceMesh;
-                    name        rotating.stl;
-                }
             }
 
             slave
@@ -101,11 +94,6 @@ baffles
                 neighbourPatch  AMI1;
                 transform       noOrdering;
                 lowWeightCorrection 0.2;
-                surface
-                {
-                    type        triSurfaceMesh;
-                    name        rotating.stl;
-                }
             }
         }
     }

tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict

@@ -30,8 +30,7 @@ simpleCoeffs
 hierarchicalCoeffs
 {
     n               ( 2 2 2 );
-    delta           0.2;    // rotate a bit to avoid baffle topology
+    delta           0.001;
-                            // at processor boundary
     order           xyz;
 }
 

tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution

@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha.water
+    alpha.phase1
     {
         nAlphaCorr          1;
         nAlphaSubCycles     2;
@@ -66,16 +66,15 @@ solvers
     "U.*"
     {
         solver          smoothSolver;
-        smoother        GaussSeidel;
+        smoother        symGaussSeidel;
         tolerance       1e-6;
         relTol          0;
-        nSweeps         1;
     }
 
     "(T|k|epsilon).*"
     {
-        solver          PBiCG;
+        solver          smoothSolver;
-        preconditioner  DILU;
+        smoother        symGaussSeidel;
         tolerance       1e-6;
         relTol          0;
     }

tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict

@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha.water 1
+    volScalarFieldValue alpha.phase1 1
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (-4 -4 -1) (4 4 0.74);
         fieldValues
         (
-            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.phase1 0
         );
     }
 );