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

applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C

@@ -174,7 +174,7 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
     searchableSurface_(geometryToConformTo.geometry()[surfaceName_]),
     geometryToConformTo_(geometryToConformTo),
     cellSizeFunctions_(1),
-    regionToCellSizeFunctions_(geometryToConformTo_.patchNames().size(), -1),
+    regionToCellSizeFunctions_(searchableSurface_.regions().size(), -1),
     maxPriority_(-1)
 {
     Info<< indent << "Master settings:" << endl;
@@ -205,11 +205,11 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
     if (controlFunctionDict.found("regions"))
     {
         const dictionary& regionsDict = controlFunctionDict.subDict("regions");
-        const wordList& regionNames = geometryToConformTo_.patchNames();
+        const wordList& regionNames = searchableSurface_.regions();
 
         label nRegions = regionsDict.size();
 
-        regionCellSizeFunctions.setSize(nRegions + 1);
+        regionCellSizeFunctions.setSize(nRegions);
         defaultCellSizeRegions.setCapacity(nRegions);
 
         forAll(regionNames, regionI)
@@ -263,6 +263,8 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
     }
     else if (nRegionCellSizeFunctions > 0)
     {
+        regionCellSizeFunctions.setSize(nRegionCellSizeFunctions + 1);
+
         regionCellSizeFunctions.set
         (
             nRegionCellSizeFunctions,
@@ -275,7 +277,7 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
             )
         );
 
-        const wordList& regionNames = geometryToConformTo_.patchNames();
+        const wordList& regionNames = searchableSurface_.regions();
 
         forAll(regionNames, regionI)
         {
@@ -289,7 +291,7 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
     }
     else
     {
-        const wordList& regionNames = geometryToConformTo_.patchNames();
+        const wordList& regionNames = searchableSurface_.regions();
 
         forAll(regionNames, regionI)
         {

applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C

@@ -369,13 +369,15 @@ Foam::conformationSurfaces::conformationSurfaces
             featureI
         );
 
+        const wordList& rNames = allGeometry_[surfaces_[surfI]].regions();
+
         if (surfaceSubDict.found("regions"))
         {
             const dictionary& regionsDict = surfaceSubDict.subDict("regions");
 
-            forAll(regionNames, regionI)
+            forAll(rNames, regionI)
             {
-                const word& regionName = regionNames[regionI];
+                const word& regionName = rNames[regionI];
 
                 if (regionsDict.found(regionName))
                 {

src/OpenFOAM/containers/Lists/List/List.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-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,10 +162,10 @@ public:
 
         // Edit
 
-            //- Reset size of List.
+            //- Alias for setSize(const label)
             inline void resize(const label);
 
-            //- Reset size of List and value for new elements.
+            //- Alias for setSize(const label, const T&)
             inline void resize(const label, const T&);
 
             //- Reset size of List.

src/OpenFOAM/containers/Lists/PtrList/PtrList.H

@@ -173,16 +173,12 @@ public:
 
         // Edit
 
-            //- Reset size of PtrList.  This can only be used to set the size
+            //- Reset size of PtrList. If extending the PtrList, new entries are
-            //  of an empty PtrList, extend a PtrList, remove entries from
+            //  set to NULL. If truncating the PtrList, removed entries are
-            //  the end of a PtrList. If the entries are non-empty they are
             //  deleted.
             void setSize(const label);
 
-            //- Reset size of PtrList.  This can only be used to set the size
+            //- Alias for setSize(const label)
-            //  of an empty PtrList, extend a PtrList, remove entries from
-            //  the end of a PtrList. If the entries are non-empty they are
-            //  deleted.
             inline void resize(const label);
 
             //- Clear the PtrList, i.e. set size to zero deleting all the

src/meshTools/searchableSurface/searchableSurfaces.C

@@ -301,7 +301,7 @@ Foam::label Foam::searchableSurfaces::findSurfaceRegionID
 {
     label surfaceIndex = findSurfaceID(surfaceName);
 
-    return findIndex(regionNames()[surfaceIndex], regionName);
+    return findIndex(this->operator[](surfaceIndex).regions(), regionName);
 }
 
 

tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict

@@ -22,34 +22,7 @@ FoamFile
 
 geometry
 {
-    flange.stl
+    #include "meshDict.geometry"
-    {
-        name flange;
-        type triSurfaceMesh;
-
-        regions
-        {
-            patch1
-            {
-                name wall;
-            }
-
-            patch2
-            {
-                name plate;
-            }
-
-            patch3
-            {
-                name rings;
-            }
-
-            patch4
-            {
-                name outlet;
-            }
-        }
-    }
 }
 
 
@@ -80,7 +53,7 @@ surfaceConformation
 
             regions
             {
-                wall
+                patch1
                 {
                     patchInfo
                     {
@@ -88,7 +61,7 @@ surfaceConformation
                     }
                 }
 
-                plate
+                patch2
                 {
                     patchInfo
                     {
@@ -96,7 +69,7 @@ surfaceConformation
                     }
                 }
 
-                rings
+                patch3
                 {
                     patchInfo
                     {
@@ -104,7 +77,7 @@ surfaceConformation
                     }
                 }
 
-                outlet
+                patch4
                 {
                     patchInfo
                     {
@@ -150,7 +123,7 @@ motionControl
 
             regions
             {
-                rings
+                patch3
                 {
                     type                        searchableSurfaceControl;
                     priority                    2;
@@ -158,7 +131,7 @@ motionControl
                     surfaceCellSizeFunction     uniformValue;
                     uniformValueCoeffs
                     {
-                        surfaceCellSizeCoeff    0.5;
+                        surfaceCellSizeCoeff    0.25;
                     }
                     cellSizeFunction            surfaceOffsetLinearDistance;
                     surfaceOffsetLinearDistanceCoeffs

tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict

@@ -59,9 +59,9 @@ surfaceConformation
             extendedFeatureEdgeMesh "vessel.extendedFeatureEdgeMesh";
             regions
             {
-                vessel_wall         {}
+                patch1  {}
-                vessel_outletPipe   {}
+                patch2  {}
-                vessel_outlet       {}
+                patch3  {}
             }
         }
 
@@ -142,7 +142,7 @@ motionControl
 
             regions
             {
-                vessel_wall
+                patch1
                 {
                     surfaceCellSizeFunction     uniformValue;
                     uniformValueCoeffs
@@ -154,7 +154,7 @@ motionControl
                     uniformCoeffs{}
                 }
 
-                vessel_outletPipe
+                patch2
                 {
                     priority                    2;
                     surfaceCellSizeFunction     uniformValue;
@@ -170,7 +170,7 @@ motionControl
                     }
                 }
 
-                vessel_outlet
+                patch3
                 {
                     priority                    2;
                     surfaceCellSizeFunction     uniformValue;