Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

.gitignore

@@ -16,6 +16,7 @@
 *.la
 *.so
 *.jar
+lex.yy.c
 
 # Corefiles
 core
@@ -27,10 +28,13 @@ core
 lnInclude
 
 # linux build folder(s) - anywhere
-linux*Gcc*[SD]POpt*
+linux*Gcc*
 
 # reinstate wmake/rules that look like build folders
 !wmake/rules/linux*
+# but do ignore the derived files in there
+wmake/rules/linux*/dirToString
+wmake/rules/linux*/wmkdep
 
 # doxygen generated documentation
 doc/[Dd]oxygen/html

src/meshTools/octree/treeBoundBox.C

@@ -27,8 +27,6 @@ License
 #include "treeBoundBox.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const Foam::treeBoundBox Foam::treeBoundBox::greatBox
@@ -50,6 +48,7 @@ const Foam::label facesArray[6][4] =
 };
 //! @endcond
 
+
 const Foam::faceList Foam::treeBoundBox::faces
 (
     initListList<face, label, 6, 4>(facesArray)
@@ -74,12 +73,28 @@ const Foam::label edgesArray[12][2] =
 };
 //! @endcond
 
-const Foam::edgeList Foam::treeBoundBox::edges
+
+const Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::faceNormals
 (
-    initListList<edge, label, 12, 2>(edgesArray)
+    calcFaceNormals()
 );
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::calcFaceNormals()
+{
+    FixedList<vector, 6> normals;
+    normals[LEFT]   = vector(-1,  0,  0);
+    normals[RIGHT]  = vector( 1,  0,  0);
+    normals[BOTTOM] = vector( 0, -1,  0);
+    normals[TOP]    = vector( 0,  1,  0);
+    normals[BACK]   = vector( 0,  0, -1);
+    normals[FRONT]  = vector( 0,  0,  1);
+    return normals;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct as the bounding box of the given pointField

src/meshTools/octree/treeBoundBox.H

@@ -78,6 +78,11 @@ class treeBoundBox
     public boundBox
 {
 
+private:
+
+        //- To initialise faceNormals.
+        static FixedList<vector, 6> calcFaceNormals();
+
 public:
 
     // Static data members
@@ -142,6 +147,9 @@ public:
         //- Edge to point addressing
         static const edgeList edges;
 
+        //- Per face the unit normal
+        static const FixedList<vector, 6> faceNormals;
+
 
         //- Face on which neighbour is
         static direction neighbourFaceBits(const label&);

wmake/src/wmkdep.l

@@ -56,7 +56,7 @@ void importDirectory(const char* dirName);
 
 %}
 
-%s CMNT CFNAME SCFNAME JFNAME FFNAME
+%x CMNT CFNAME SCFNAME JFNAME FFNAME
 %%
 
 "//".*\n                  ;            /* remove c++ style one line comments */