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

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    buoyantSimpleRadiationFoam
+    buoyantSimpleFoam
 
 Description
     Steady-state solver for buoyant, turbulent flow of compressible fluids,

src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C

@@ -77,10 +77,12 @@ Foam::PatchTools::sortedEdgeFaces
             {
                 if (f0[fpI] != e.start())
                 {
-                    const vector faceEdgeDir = localPoints[f0[fpI]] - edgePt;
-                    const scalar angle = faceEdgeDir & e2;
+                    vector faceEdgeDir = localPoints[f0[fpI]] - edgePt;
+                    faceEdgeDir /= mag(faceEdgeDir) + VSMALL;
 
-                    if (angle < maxAngle)
+                    const scalar angle = e2 & faceEdgeDir;
+
+                    if (mag(angle) < maxAngle)
                     {
                         maxAngle = angle;
                         maxAngleEdgeDir = faceEdgeDir;
@@ -114,10 +116,12 @@ Foam::PatchTools::sortedEdgeFaces
                 {
                     if (f[fpI] != e.start())
                     {
-                        const vector faceEdgeDir = localPoints[f[fpI]] - edgePt;
-                        const scalar angle = faceEdgeDir & e2;
+                        vector faceEdgeDir = localPoints[f[fpI]] - edgePt;
+                        faceEdgeDir /= mag(faceEdgeDir) + VSMALL;
+
+                        const scalar angle = e2 & faceEdgeDir;
 
-                        if (angle < maxAngle)
+                        if (mag(angle) < maxAngle)
                         {
                             maxAngle = angle;
                             maxAngleEdgeDir = faceEdgeDir;