Merge branch 'development' into release

.gitignore

 *.dep
+*lnInclude*
+*linux*
+cfMesh.*
 **/lnInclude/*
 **/Make/**/*

meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorAdjustOctreeToSurface.C

@@ -770,7 +770,7 @@ void meshOctreeCreator::refineBoxesIntersectingEdgeMeshes()
                 const point& sp = points[e.start()];
                 const point& ep = points[e.end()];
 
-                boundBox edgeBB(sp, ep);
+                boundBox edgeBB(min(sp, ep), max(sp, ep));
 
                 edgeBB.min() -= tol;
                 edgeBB.max() += tol;

tutorials/cartesianMesh/asmoOctree/system/meshDict

@@ -21,23 +21,21 @@ surfaceFile "geom.stl";
 
 maxCellSize 0.2;
 
-boundaryCellSize 0.025;
-
-minCellSize 0.0125;
+boundaryCellSize 0.1;
 
 localRefinement
 {
     defaultFaces0006
     {
-        cellSize 0.005;
+        cellSize 0.01;
     }
     defaultFaces0007
     {
-        cellSize 0.0025;
+        cellSize 0.005;
     }
     defaultFaces0009
     {
-        cellSize 0.0025;
+        cellSize 0.005;
     }
 }
  

tutorials/cartesianMesh/bunnyOctree/system/meshDict

@@ -19,15 +19,15 @@ FoamFile
 
 surfaceFile "bunnyWrapped.stl";
 
-maxCellSize 30.0;
+maxCellSize 100.0;
 
-boundaryCellSize 7.5;
+boundaryCellSize 25;
 
 objectRefinements
 {
     ear1
     {
-        cellSize 3.75;
+        cellSize 10;
         type cone;
         p0   (-100 1873 -320);
         radius0  200;
@@ -36,7 +36,7 @@ objectRefinements
     }
     ear2
     {
-        cellSize 3.75;
+        cellSize 10;
         type cone;
         p0   (-650 1873 -620);
         radius0  200;
@@ -45,7 +45,7 @@ objectRefinements
     }
     tail
     {
-        cellSize 3.75;
+        cellSize 10;
         type box;
         centre  (500 500 150);
         lengthX  100;
@@ -54,14 +54,14 @@ objectRefinements
     }
     insideTheBody
     {
-        cellSize 3.75;
+        cellSize 10;
         type sphere;
         centre  (0 700 0);
         radius  50;
     }
     muzzlePiercing
     {
-        cellSize 3.75;
+        cellSize 10;
         type line;
         p0      (-750 1000 450);
         p1      (-750 1500 450);

tutorials/cartesianMesh/ship5415Octree/system/meshDict

@@ -19,16 +19,13 @@ FoamFile
 
 surfaceFile "5415Joined3.ftr";
 
-maxCellSize 100;
-
-boundaryCellSize    50;
-//boundaryCellSizeRefinementThickness 50;
+maxCellSize 150;
 
 surfaceMeshRefinement
 {
     hull
     {
-        additionalRefinementLevels  3;
+        additionalRefinementLevels  1;
         surfaceFile "5415Joined1.stl";
         refinementThickness 50;
     }
@@ -86,7 +83,7 @@ boundaryLayers
     optimisationParameters
     {
         nSmoothNormals 3;
-        maxNumIterations 5;
+        maxNumIterations 2;
         featureSizeFactor 0.4;
         reCalculateNormals 1;
         relThicknessTol 0.1;

tutorials/pMesh/multipleOrifices/system/meshDict

@@ -21,7 +21,7 @@ surfaceFile "multipleOrifices.stl";
 
 maxCellSize 5.0;
 
-boundaryCellSize 2.0;
+//boundaryCellSize 2.0;
 
 localRefinement
 {
@@ -49,46 +49,6 @@ localRefinement
 boundaryLayers
 {
     nLayers 1;
-
-    thicknessRatio 1.2;
-
-    patchBoundaryLayers
-    {
-        "orifice.*"
-        {
-            nLayers           4;
-
-            thicknessRatio    1.2;
-
-            maxFirstLayerThickness 0.2;
-
-            allowDiscontinuity 0;
-        }
-
-    	"fixedWalls.*"
-        {
-            nLayers           4;
-
-            thicknessRatio    1.2;
-
-            maxFirstLayerThickness 1.0;
-
-            allowDiscontinuity 0;
-        }
-
-	    "tubes.*"
-        {
-            nLayers           4;
-
-            thicknessRatio    1.2;
-
-            maxFirstLayerThickness 1.0;
-
-            allowDiscontinuity 0;
-        }
-    }
-
-    optimiseLayer 1;
 }
 
 renameBoundary

tutorials/tetMesh/socketOctree/system/meshDict

@@ -17,17 +17,17 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-boundaryCellSize	1.5;
-keepCellsIntersectingBoundary	1;
-maxCellSize	3;
-minCellSize	0.375;
-removeGluedMesh	0;
+boundaryCellSize	4.5;
+//keepCellsIntersectingBoundary	1;
+maxCellSize	9;
+//minCellSize	0.375;
+
 surfaceFile	"socket.fms";
 
 boundaryLayers
 {
-    maxFirstLayerThickness	0.5;
-    nLayers	3;
+    maxFirstLayerThickness	2.0;
+    nLayers	1;
     thicknessRatio	1.2;
 
     patchBoundaryLayers
@@ -36,8 +36,8 @@ boundaryLayers
         patch7
         {
             allowDiscontinuity	0;
-            maxFirstLayerThickness	0.5;
-            nLayers	4;
+            maxFirstLayerThickness	1.0;
+            nLayers	2;
             thicknessRatio	1.1;
         }
     }
@@ -53,12 +53,12 @@ localRefinement
 
     subset1
     {
-        cellSize	1.5;
+        cellSize	4.5;
     }
 
     subset2
     {
-        cellSize	1.5;
+        cellSize	4.5;
     }
 }