From 974e509eb449de2ca2e3c46286498d29313146ff Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 26 Sep 2013 14:15:19 +0100
Subject: [PATCH] ENH: surfaceIntersection: Change error to warning
---
.../booleanOps/surfaceIntersection/surfaceIntersection.C | 4 ++--
tutorials/mesh/foamyHexMesh/blob/Allrun | 6 ++++++
tutorials/mesh/foamyHexMesh/blob/Allrun-parallel | 6 ++++++
tutorials/mesh/foamyHexMesh/simpleShapes/Allclean | 2 ++
tutorials/mesh/foamyHexMesh/simpleShapes/Allrun | 2 ++
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 252bcdfbdca..0ede58107cb 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -968,10 +968,10 @@ Foam::surfaceIntersection::surfaceIntersection
if (!usedPoints.found(pointI))
{
- FatalErrorIn("surfaceIntersection::surfaceIntersection")
+ WarningIn("surfaceIntersection::surfaceIntersection")
<< "Problem: cut point:" << pointI
<< " coord:" << cutPoints_[pointI]
- << " not used by any edge" << abort(FatalError);
+ << " not used by any edge" << endl;
}
}
}
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index abcd8419bda..3ef4e5b75e1 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -8,7 +8,13 @@ cd ${0%/*} || exit 1 # run from this directory
cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
runApplication foamyHexMesh
+
runApplication collapseEdges -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
runApplication checkMesh -latestTime -allGeometry -allTopology
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 3113b197871..1674277920d 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -14,7 +14,13 @@ runApplication blockMesh -region backgroundMeshDecomposition
runApplication decomposePar -region backgroundMeshDecomposition
runParallel foamyHexMesh $nProc
+
runParallel collapseEdges $nProc -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
runApplication reconstructParMesh -latestTime
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
index 3e9b928240b..94024b2b8ce 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
@@ -15,6 +15,8 @@ rm -r snapToSurface?.obj tetsToSnapTo.obj > /dev/null 2>&1
rm domain coneAndSphere > /dev/null 2>&1
+rm -rf 0/
+
cleanCase
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
index bfc610ad80c..497c84f91fb 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
@@ -22,5 +22,7 @@ runApplication surfaceBooleanFeatures intersection \
runApplication foamyHexMesh
+runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
+
# ----------------------------------------------------------------- end-of-file
--
GitLab