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

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Description
          to Cavitation Prediction,”
         Computers and Fluids,
         29(8):849-875, 2000.
-    @verbatim
+    @endverbatim
 
 SourceFiles
     Kunz.C

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H

@@ -2,7 +2,7 @@
   ========Merkle=                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
         "Computational modeling of the dynamics of sheet cavitation",
         in Proceedings Third International Symposium on Cavitation
         Grenoble, France 1998.
-   @verbatim
+   @endverbatim
 
 SourceFiles
     Merkle.C

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
         "Physical and Numerical Modeling of Unsteady Cavitation Dynamics",
         Proc. 4th International Conference on Multiphase Flow,
         New Orleans, U.S.A., 2001.
-    @verbatim
+    @endverbatim
 
 SourceFiles
     SchnerrSauer.C

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,9 +30,9 @@ Description
         - create baffles in original mesh with directMappedWall patches
     - if extruding boundary faces:
         - convert boundary faces to directMappedWall patches
-    - extrude edges of faceZone as a <zone>_sidePatch
+    - extrude edges of faceZone as a \<zone\>_sidePatch
     - extrude edges inbetween different faceZones as a
-      (nonuniformTransform)cyclic <zoneA>_<zoneB>
+      (nonuniformTransform)cyclic \<zoneA\>_\<zoneB\>
     - extrudes into master direction (i.e. away from the owner cell
       if flipMap is false)
     - not parallel
@@ -106,7 +106,7 @@ becomes
 
 Usage
 
-    - extrudeToRegionMesh <regionName> <faceZones> <thickness>
+    - extrudeToRegionMesh \<regionName\> \<faceZones\> \<thickness\>
 
     @param \<regionName\> \n
     Name of mesh to create.

bin/tools/doxyFilter

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -52,7 +52,7 @@ then
 #    */applications/solvers/*.H | */applications/utilities/*.H )
 #        awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilter-ignore.awk
 #        ;;
-   esac
+    esac
 
     awk -f $awkScript $1 | \
     sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \

bin/tools/doxyFilter.awk

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
@@ -57,7 +57,7 @@ BEGIN {
     # start comment block
     if (state == 1)
     {
-        printf "/*!\n"
+        printf "/*! "
         state = 2
     }
 
@@ -79,7 +79,7 @@ BEGIN {
     # end comment block
     if (state == 2)
     {
-        printf "*/\n"
+        printf "*/ "
     }
     state = 0
     print

bin/tools/doxyFilter.sed

@@ -11,34 +11,20 @@
 /^License/,/\*\//{
 /^License/,\%http://www.gnu.org/licenses%{
 s?^License.*?\*\/\
-\/\*! @file %filePath%\
+\/\*! \\file %filePath%\
 <b>Original source file</b> <a href="%filePath%">%fileName%</a>\
+\
+\
+\
+\
+\
+\
+\
+\
 ?
 /^    /d
 }
 
-# old FSF address
-/^License/,/MA 0211.-130. USA/{
-s?^License.*?\*\/\
-\/\*! @file %filePath%\
-<b>Original source file</b> <a href="%filePath%">%fileName%</a>\
-?
-/^    /d
-}
-
-# remove entry
-/^Primitive *$/{
-N
-N
-d
-}
-
-# remove entry
-/^Implementation *$/{
-N
-N
-d
-}
 
 # remove entry
 /^Application *$/{
@@ -47,12 +33,6 @@ N
 d
 }
 
-# remove entry
-/^Type *$/{
-N
-N
-d
-}
 
 # remove entry
 /^Global *$/{
@@ -62,96 +42,109 @@ d
 }
 
 
+# Primitive
+#     typename
+# =>
+# \\relates typename
+#
+/^Primitive *$/,/^[^ ]/{
+s/^Primitive *$//
+s/^    /\\relates /
+}
+
+
 # Class
 #     Foam::className
 # =>
-# @class Foam::className
+# \\class Foam::className
 #
 /^Class *$/,/^[^ ]/{
-/^Class/d
+s/^Class *$//
-s/^    /@class /
+s/^    /\\class /
 }
 
 
 # Namespace
 #     namespaceName
 # =>
-# @namespace namespaceName
+# \namespace namespaceName
 #
 /^Namespace *$/,/^[^ ]/{
-/^Namespace/d
+s/^Namespace//
-s/^    /@namespace /
+s/^    /\\namespace /
 }
 
 
 # Typedef
 #     Foam::def
 # =>
-# @class Foam::def
+# \typedef Foam::def
-# This is not strictly correct, but makes it easier to find the typedefs
 /^Typedef *$/,/^[^ ]/{
-/^Typedef/d
+s/^Typedef//
-s/^    /@class /
+s/^    /\\typedef /
 }
 
 
-# add anchor and use @brief
+# add anchor and use \brief
 # the first paragraph will be 'brief' and the others 'detail'
 /^Description *$/,/^[^ ]/{
 /^Description/c\
-<a class="anchor" name="Description"></a>\
+<a class="anchor" name="Description"></a> \\brief
-@brief
 s/^    //
 }
 
 /^Usage *$/,/^[^ ]/{
 /^Usage/c\
-@par Usage
+\\par Usage
 s/^    //
 }
 
 
 /^See *Also *$/,/^[^ ]/{
 /^See *Also/c\
-@see
+\\see
-s/^    //
-}
-
-/^Author *$/,/^[^ ]/{
-/^Author/c\
-@author
 s/^    //
 }
 
 /^Note *$/,/^[^ ]/{
 /^Note/c\
-@note
+\\note
 s/^    //
 }
 
 
 # remove ToDo paragraph to avoid them showing on related pages
-/^To[Dd]o *$/,/^ *$/d
+/^To[Dd]o *$/,/^[^ ]/{
+s/^To[Dd]o *$//
+s/^    .*//
+}
 
 
 /^Warning *$/,/^[^ ]/{
 /^Warning/c\
-@warning
+\\warning
 s/^    //
 }
 
+
 /^Deprecated *$/,/^[^ ]/{
 /^Deprecated/c\
-@deprecated
+\\deprecated
 s/^    //
 }
 
-/SourceFiles/,/^[ ]*$/{
+
-s?SourceFiles?@par Source files\
+/^SourceFiles *$/,/^$/{
-<ul>\
+s?SourceFiles?\\par Source files\
-  <li><a href="%filePath%">%fileName%</a></li>?
+<ul><li><a href="%filePath%">%fileName%</a></li>?
-s?^[ ]*$?</ul>\
+s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
-?
+s?^$?</ul>?
+}
+
+/fileName%<\/a><\/li>$/{
+N
+s?\n$?</ul>?g
+s/<\/li>\n/<\/li> /
 s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
 }
 

doc/Doxygen/Doxyfile

@@ -1104,7 +1104,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = DTAGS
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
@@ -1254,7 +1254,7 @@ DOTFILE_DIRS           =
 # MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 10
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
@@ -1264,7 +1264,7 @@ DOT_GRAPH_MAX_NODES    = 50
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-MAX_DOT_GRAPH_DEPTH    = 3
+MAX_DOT_GRAPH_DEPTH    = 1
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, which results in a white background.

doc/doxygen/Doxyfile

@@ -581,7 +581,8 @@ WARN_LOGFILE           =
 # limit input for testing purposes
 INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
                          $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
-                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives \
+                         $(WM_PROJECT_DIR)/src/finiteVolume/fvMesh
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1353,7 +1354,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = DTAGS
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes

src/OSspecific/POSIX/fileMonitor.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,8 +109,7 @@ namespace Foam
 
 
 
-    //! @cond internalClass
+    //-  Internal tracking via stat(3p) or inotify(7)
-    //- Internal tracking via stat(3p) or inotify(7)
     class fileMonitorWatcher
     {
     public:
@@ -140,7 +139,7 @@ namespace Foam
         {
             if (useInotify_)
             {
-#ifdef FOAM_USE_INOTIFY
+                #ifdef FOAM_USE_INOTIFY
                 inotifyFd_ = inotify_init();
                 dirWatches_.setCapacity(sz);
                 dirFiles_.setCapacity(sz);
@@ -167,13 +166,13 @@ namespace Foam
                             << endl;
                     }
                 }
-#else
+                #else
                     FatalErrorIn("fileMonitorWatcher(const bool, const label)")
                         << "You selected inotify but this file was compiled"
                         << " without FOAM_USE_INOTIFY"
                         << "Please select another fileModification test method"
                         << exit(FatalError);
-#endif
+                #endif
             }
             else
             {
@@ -184,7 +183,7 @@ namespace Foam
         //- remove all watches
         inline ~fileMonitorWatcher()
         {
-#ifdef FOAM_USE_INOTIFY
+            #ifdef FOAM_USE_INOTIFY
             if (useInotify_ && inotifyFd_ >= 0)
             {
                 forAll(dirWatches_, i)
@@ -200,7 +199,7 @@ namespace Foam
                     }
                 }
             }
-#endif
+            #endif
         }
 
         inline bool addWatch(const label watchFd, const fileName& fName)
@@ -212,7 +211,7 @@ namespace Foam
                     return false;
                 }
 
-#ifdef FOAM_USE_INOTIFY
+                #ifdef FOAM_USE_INOTIFY
                 // Add/retrieve watch on directory containing file.
                 // Note that fName might be non-existing in special situations
                 // (master-only reading for IODictionaries)
@@ -250,7 +249,7 @@ namespace Foam
 
                 dirWatches_(watchFd) = dirWatchID;
                 dirFiles_(watchFd) = fName.name();
-#endif
+                #endif
             }
             else
             {
@@ -288,7 +287,6 @@ namespace Foam
         }
 
     };
-    //! @endcond
 }
 
 
@@ -298,7 +296,7 @@ void Foam::fileMonitor::checkFiles() const
 {
     if (useInotify_)
     {
-#ifdef FOAM_USE_INOTIFY
+        #ifdef FOAM_USE_INOTIFY
         // Large buffer for lots of events
         char buffer[EVENT_BUF_LEN];
 
@@ -392,7 +390,7 @@ void Foam::fileMonitor::checkFiles() const
                 return;
             }
         }
-#endif
+        #endif
     }
     else
     {

src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::addToGlobalFunctionSelectionTable
+Global
+    Foam::addToGlobalFunctionSelectionTable
 
 Description
     Macros for easy insertion into global function selection tables
@@ -33,20 +34,18 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToGlobalFunctionSelectionTable\
 (memberFunction,argNames,lookup,functionPtr)                                  \
                                                                               \
     /* Add to the table, find by lookup name */                               \
     add##memberFunction##argNames##GlobalMemberFunctionToTable                \
-    add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_\
+    add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_ \
     (#lookup, functionPtr)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //

src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::globalFunctionSelectionTables
+Global
+    Foam::globalFunctionSelectionTables
 
 Description
     Macros to enable the easy declaration of global function selection tables.
@@ -35,7 +36,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // external use:
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
@@ -138,7 +138,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //

src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::addToStaticMemberFunctionSelectionTable
+Global
+    Foam::addToStaticMemberFunctionSelectionTable
 
 Description
     Macros for easy insertion into member function selection tables
@@ -47,7 +48,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //

src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,7 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@file Foam::staticMemberFunctionSelectionTables
+Global
+    Foam::staticMemberFunctionSelectionTables
 
 Description
     Macros to enable the easy declaration of member function selection tables.
@@ -35,7 +36,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 // external use:
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
@@ -140,7 +140,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 #endif
 
 // ************************************************************************* //

src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::interpolationTable
 
 Description
-    An interpolation/look-up table of scalar vs <Type> values.
+    An interpolation/look-up table of scalar vs \<Type\> values.
     The reference scalar values must be monotonically increasing.
 
     The handling of out-of-bounds values depends on the current setting

src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DiagonalMatrix<Type>
+    Foam::DiagonalMatrix
 
 Description
     DiagonalMatrix<Type> is a 2D diagonal matrix of objects

src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H

@@ -27,7 +27,7 @@ Class
 Description
     Templated basic entry that holds a constant value.
 
-    Usage - for entry <entryName> having the value <value>:
+    Usage - for entry \<entryName\> having the value <value>:
     @verbatim
         <entryName>    constant  <value>
     @endverbatim

src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H

@@ -27,7 +27,7 @@ Class
 Description
     Templated table container data entry. Items are stored in a list of
     Tuple2's. First column is always stored as scalar entries. Data is read
-    in the form, e.g. for an entry <entryName> that is (scalar, vector):
+    in the form, e.g. for an entry \<entryName\> that is (scalar, vector):
 
     @verbatim
         <entryName>   table

src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H

@@ -26,7 +26,7 @@ Class
 
 Description
     Polynomial container data entry for scalars. Items are stored in a list of
-    Tuple2's. Data is input in the form, e.g. for an entry <entryName> that
+    Tuple2's. Data is input in the form, e.g. for an entry \<entryName\> that
     describes y = x^2 + 2x^3
 
     @verbatim

src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H

@@ -49,21 +49,21 @@ namespace Foam
 
     //- An optimized version of Hasher
     //  @param[in] data - an array of uint32_t values
-    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] length - the number of values (not bytes)
     //  @param[in] seed - the previous hash, or an arbitrary value
-    unsigned HasherInt(const uint32_t*, size_t length, unsigned seed = 0);
+    unsigned HasherInt(const uint32_t* data, size_t length, unsigned seed = 0);
 
     //- An optimized version of Hasher, returning dual hash values
     //  @param[in] data - an array of uint32_t values
-    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] length - the number of values (not bytes)
     //  @param[in] hash1 - the previous hash, or an arbitrary value
     //    on output, the primary hash value
     //  @param[in] hash1 - the previous hash, or an arbitrary value
     //    on output, the secondary hash value
     unsigned HasherDual
     (
-        const uint32_t*,
+        const uint32_t* data,
-        size_t len,
+        size_t length,
         unsigned& hash1,
         unsigned& hash2
     );

src/finiteVolume/cfdTools/general/porousMedia/PorousZones.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::PorousZones<ZoneType>
+    Foam::PorousZones
 
 Description
     A centralized ZoneType collection.

src/finiteVolume/fvMesh/fvMesh.H

@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open So
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,16 @@ SourceFiles
     fvMesh.C
     fvMeshGeometry.C
 
+See Also
+    hmm
+
+Usage
+    oeuoeuoeu
+
+ToDo
+    oeuoeuoeu
+    oeueouoeu
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef fvMesh_H

src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,14 +156,14 @@ namespace fvc
     );
 
 
-    //- Interpolate tmp field onto faces using 'interpolate(<name>)'
+    //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
     (
         const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
     );
 
-    //- Interpolate tmp field onto faces using 'interpolate(<name>)'
+    //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
     (

src/lagrangian/basic/Cloud/Cloud.H

@@ -381,7 +381,7 @@ public:
                 IOstream::compressionType cmp
             ) const;
 
-            //- Write positions to <cloudName>_positions.obj file
+            //- Write positions to \<cloudName\>_positions.obj file
             void writePositions() const;
 
 

src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,10 @@ Description
     adds/subtracts a field or value to/from a base field.
 
     New field name specified by -resultName option, or automatically as:
-        <baseFieldName>_add_<addSubtractFieldName>
+        \<baseFieldName\>_add_<addSubtractFieldName>
-        <baseFieldName>_add_value
+        \<baseFieldName\>_add_value
-        <baseFieldName>_subtract_<addSubtractFieldName>
+        \<baseFieldName\>_subtract_<addSubtractFieldName>
-        <baseFieldName>_subtract_value
+        \<baseFieldName\>_subtract_value
 
     Example usage:
         addSubtract p add -value 100000 -resultName pAbs

src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::RASModels::mutRoughWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutkRoughWallFunctionFvPatchScalarField
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall

src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmaras
+    Foam::incompressible::LESModels::SpalartAllmaras
 
 Description
     SpalartAllmaras DES (SA + LES) turbulence model for incompressible flows

src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmarasDDES
+    Foam::incompressible::LESModels::SpalartAllmarasDDES
 
 Description
     SpalartAllmaras DDES LES turbulence model for incompressible flows

src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::SpalartAllmarasIDDES
+    Foam::incompressible::LESModels::SpalartAllmarasIDDES
 
 Description
     SpalartAllmarasIDDES LES turbulence model for incompressible flows

src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::LESmodels::kOmegaSSTSAS
+    Foam::incompressible::LESModels::kOmegaSSTSAS
 
 Description
     kOmegaSSTSAS LES turbulence model for incompressible flows

tutorials/incompressible/simpleFoam/motorBike/Allclean

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -f system/fvSolution
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase

tutorials/incompressible/simpleFoam/motorBike/Allrun

@@ -1,11 +1,15 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+cp system/fvSolution.org system/fvSolution
+cp -r 0.org 0 > /dev/null 2>&1
+
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication simpleFoam
 
-# ----------------------------------------------------------------- end-of-file
+sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 10;/g' system/fvSolution
+runApplication potentialFoam -writep
+sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 0;/g' system/fvSolution
+
+runApplication simpleFoam

tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary

@@ -0,0 +1,454 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+72
+(
+    frontAndBack
+    {
+        type            patch;
+        nFaces          320;
+        startFace       1028304;
+    }
+    inlet
+    {
+        type            patch;
+        nFaces          64;
+        startFace       1028624;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          64;
+        startFace       1028688;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          5330;
+        startFace       1028752;
+    }
+    upperWall
+    {
+        type            patch;
+        nFaces          160;
+        startFace       1034082;
+    }
+    motorBike_frt-fairing:001%1
+    {
+        type            wall;
+        nFaces          5427;
+        startFace       1034242;
+    }
+    motorBike_windshield:002%2
+    {
+        type            wall;
+        nFaces          50;
+        startFace       1039669;
+    }
+    motorBike_rr-wh-rim:005%5
+    {
+        type            wall;
+        nFaces          136;
+        startFace       1039719;
+    }
+    motorBike_rr-wh-rim:010%10
+    {
+        type            wall;
+        nFaces          340;
+        startFace       1039855;
+    }
+    motorBike_fr-wh-rim:011%11
+    {
+        type            wall;
+        nFaces          473;
+        startFace       1040195;
+    }
+    motorBike_fr-wh-brake-disk:012%12
+    {
+        type            wall;
+        nFaces          54;
+        startFace       1040668;
+    }
+    motorBike_frame:016-shadow%13
+    {
+        type            wall;
+        nFaces          97;
+        startFace       1040722;
+    }
+    motorBike_rear-susp:014%14
+    {
+        type            wall;
+        nFaces          839;
+        startFace       1040819;
+    }
+    motorBike_rear-susp:014-shadow%15
+    {
+        type            wall;
+        nFaces          469;
+        startFace       1041658;
+    }
+    motorBike_frame:016%16
+    {
+        type            wall;
+        nFaces          68;
+        startFace       1042127;
+    }
+    motorBike_rr-wh-rim:005-shadow%17
+    {
+        type            wall;
+        nFaces          71;
+        startFace       1042195;
+    }
+    motorBike_rr-wh-chain-hub:022%22
+    {
+        type            wall;
+        nFaces          141;
+        startFace       1042266;
+    }
+    motorBike_rearseat%24
+    {
+        type            wall;
+        nFaces          430;
+        startFace       1042407;
+    }
+    motorBike_frt-fairing%25
+    {
+        type            wall;
+        nFaces          626;
+        startFace       1042837;
+    }
+    motorBike_windshield%26
+    {
+        type            wall;
+        nFaces          378;
+        startFace       1043463;
+    }
+    motorBike_headlights%27
+    {
+        type            wall;
+        nFaces          161;
+        startFace       1043841;
+    }
+    motorBike_driversseat%28
+    {
+        type            wall;
+        nFaces          368;
+        startFace       1044002;
+    }
+    motorBike_rear-body%29
+    {
+        type            wall;
+        nFaces          2077;
+        startFace       1044370;
+    }
+    motorBike_fuel-tank%30
+    {
+        type            wall;
+        nFaces          912;
+        startFace       1046447;
+    }
+    motorBike_exhaust%31
+    {
+        type            wall;
+        nFaces          2392;
+        startFace       1047359;
+    }
+    motorBike_rr-wh-rim%32
+    {
+        type            wall;
+        nFaces          1430;
+        startFace       1049751;
+    }
+    motorBike_fr-mud-guard%33
+    {
+        type            wall;
+        nFaces          639;
+        startFace       1051181;
+    }
+    motorBike_fr-wh-rim%34
+    {
+        type            wall;
+        nFaces          591;
+        startFace       1051820;
+    }
+    motorBike_fr-wh-brake-disk%35
+    {
+        type            wall;
+        nFaces          431;
+        startFace       1052411;
+    }
+    motorBike_fr-brake-caliper%36
+    {
+        type            wall;
+        nFaces          164;
+        startFace       1052842;
+    }
+    motorBike_fr-wh-tyre%37
+    {
+        type            wall;
+        nFaces          1116;
+        startFace       1053006;
+    }
+    motorBike_hbars%38
+    {
+        type            wall;
+        nFaces          535;
+        startFace       1054122;
+    }
+    motorBike_fr-forks%39
+    {
+        type            wall;
+        nFaces          1140;
+        startFace       1054657;
+    }
+    motorBike_chain%40
+    {
+        type            wall;
+        nFaces          474;
+        startFace       1055797;
+    }
+    motorBike_rr-wh-tyre%41
+    {
+        type            wall;
+        nFaces          1787;
+        startFace       1056271;
+    }
+    motorBike_square-dial%42
+    {
+        type            wall;
+        nFaces          6;
+        startFace       1058058;
+    }
+    motorBike_round-dial%43
+    {
+        type            wall;
+        nFaces          17;
+        startFace       1058064;
+    }
+    motorBike_dial-holder%44
+    {
+        type            wall;
+        nFaces          87;
+        startFace       1058081;
+    }
+    motorBike_rear-susp%45
+    {
+        type            wall;
+        nFaces          1786;
+        startFace       1058168;
+    }
+    motorBike_rear-brake-lights%46
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1059954;
+    }
+    motorBike_rear-light-bracket%47
+    {
+        type            wall;
+        nFaces          163;
+        startFace       1060007;
+    }
+    motorBike_frame%48
+    {
+        type            wall;
+        nFaces          2040;
+        startFace       1060170;
+    }
+    motorBike_rear-mud-guard%49
+    {
+        type            wall;
+        nFaces          663;
+        startFace       1062210;
+    }
+    motorBike_rear-susp-spring-damp%50
+    {
+        type            wall;
+        nFaces          107;
+        startFace       1062873;
+    }
+    motorBike_fairing-inner-plate%51
+    {
+        type            wall;
+        nFaces          445;
+        startFace       1062980;
+    }
+    motorBike_clutch-housing%52
+    {
+        type            wall;
+        nFaces          970;
+        startFace       1063425;
+    }
+    motorBike_radiator%53
+    {
+        type            wall;
+        nFaces          40;
+        startFace       1064395;
+    }
+    motorBike_water-pipe%54
+    {
+        type            wall;
+        nFaces          104;
+        startFace       1064435;
+    }
+    motorBike_water-pump%55
+    {
+        type            wall;
+        nFaces          74;
+        startFace       1064539;
+    }
+    motorBike_engine%56
+    {
+        type            wall;
+        nFaces          2389;
+        startFace       1064613;
+    }
+    motorBike_rear-shock-link%57
+    {
+        type            wall;
+        nFaces          25;
+        startFace       1067002;
+    }
+    motorBike_rear-brake-fluid-pot-bracket%58
+    {
+        type            wall;
+        nFaces          44;
+        startFace       1067027;
+    }
+    motorBike_rear-brake-fluid-pot%59
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1067071;
+    }
+    motorBike_footpeg%60
+    {
+        type            wall;
+        nFaces          86;
+        startFace       1067124;
+    }
+    motorBike_rr-wh-chain-hub%61
+    {
+        type            wall;
+        nFaces          122;
+        startFace       1067210;
+    }
+    motorBike_rear-brake-caliper%62
+    {
+        type            wall;
+        nFaces          142;
+        startFace       1067332;
+    }
+    motorBike_rider-helmet%65
+    {
+        type            wall;
+        nFaces          583;
+        startFace       1067474;
+    }
+    motorBike_rider-visor%66
+    {
+        type            wall;
+        nFaces          95;
+        startFace       1068057;
+    }
+    motorBike_rider-boots%67
+    {
+        type            wall;
+        nFaces          1025;
+        startFace       1068152;
+    }
+    motorBike_rider-gloves%68
+    {
+        type            wall;
+        nFaces          319;
+        startFace       1069177;
+    }
+    motorBike_rider-body%69
+    {
+        type            wall;
+        nFaces          4555;
+        startFace       1069496;
+    }
+    motorBike_frame:0%70
+    {
+        type            wall;
+        nFaces          37;
+        startFace       1074051;
+    }
+    motorBike_frt-fairing:001-shadow%74
+    {
+        type            wall;
+        nFaces          3306;
+        startFace       1074088;
+    }
+    motorBike_windshield-shadow%75
+    {
+        type            wall;
+        nFaces          239;
+        startFace       1077394;
+    }
+    motorBike_fr-mud-guard-shadow%81
+    {
+        type            wall;
+        nFaces          332;
+        startFace       1077633;
+    }
+    motorBike_fr-wh-brake-disk-shadow%83
+    {
+        type            wall;
+        nFaces          182;
+        startFace       1077965;
+    }
+    motorBike_rear-mud-guard-shadow%84
+    {
+        type            wall;
+        nFaces          387;
+        startFace       1078147;
+    }
+    motorBike_rear-susp-spring-damp-shadow%85
+    {
+        type            wall;
+        nFaces          41;
+        startFace       1078534;
+    }
+    motorBike_radiator-shadow%86
+    {
+        type            wall;
+        nFaces          21;
+        startFace       1078575;
+    }
+    motorBike_rear-shock-link-shadow%87
+    {
+        type            wall;
+        nFaces          10;
+        startFace       1078596;
+    }
+    motorBike_rear-brake-fluid-pot-bracket-shadow%88
+    {
+        type            wall;
+        nFaces          22;
+        startFace       1078606;
+    }
+    motorBike_rr-wh-chain-hub-shadow%89
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1078628;
+    }
+)
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/motorBike/system/controlDict

@@ -22,7 +22,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         1000;
+endTime         500;
 
 deltaT          1;
 

tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes

@@ -16,14 +16,12 @@ FoamFile
 
 ddtSchemes
 {
-    default steadyState;
+    default         steadyState;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(U)         Gauss linear;
 }
 
 divSchemes
@@ -37,7 +35,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.333;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
@@ -47,7 +45,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         corrected;
 }
 
 fluxRequired