Merge branch 'olesenm'

doc/doxygen/Doxyfile

@@ -574,12 +574,14 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-# INPUT                  = $(WM_PROJECT_DIR)/src \
+#INPUT                  = $(WM_PROJECT_DIR)/src \
 #                         $(WM_PROJECT_DIR)/applications/utilities \
 #                         $(WM_PROJECT_DIR)/applications/solvers
 
 # limit input for testing purposes
-INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global
+INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives
 
 # 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

etc/settings.csh

@@ -108,6 +108,12 @@ case OpenFOAM:
         set gmp_version=gmp-4.2.4
         set mpfr_version=mpfr-2.4.1
         breaksw
+    case Clang:
+        # using clang - not gcc
+        setenv WM_CC 'clang'
+        setenv WM_CXX 'clang++'
+        set clang_version=llvm-2.8
+        breaksw
     default:
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@@ -159,6 +165,25 @@ case OpenFOAM:
     endif
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if ( $?clang_version ) then
+        set clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        if ( ! -d "$clangDir" ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        endif
+
+        _foamAddMan     $clangDir/man
+        _foamAddPath    $clangDir/bin
+    endif
+    unset clang_version clangDir
+
     breaksw
 endsw
 

etc/settings.sh

@@ -131,6 +131,12 @@ OpenFOAM)
         gmp_version=gmp-4.2.4
         mpfr_version=mpfr-2.4.1
         ;;
+    Clang)
+        # using clang - not gcc
+        export WM_CC='clang'
+        export WM_CXX='clang++'
+        clang_version=llvm-2.8
+        ;;
     *)
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
@@ -183,6 +189,25 @@ OpenFOAM)
     fi
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if [ -n "$clang_version" ]
+    then
+        clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        [ -d "$clangDir" ] || {
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        }
+
+        _foamAddMan     $clangDir/share/man
+        _foamAddPath    $clangDir/bin
+    fi
+    unset clang_version clangDir
     ;;
 esac
 

src/OSspecific/POSIX/fileMonitor.C

@@ -49,19 +49,19 @@ Class
 
 defineTypeNameAndDebug(Foam::fileMonitor, 0);
 
-template<>
-const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
-{
-    "unmodified",
-    "modified",
-    "deleted"
-};
 const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
     Foam::fileMonitor::fileStateNames_;
 
-
 namespace Foam
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
+    {
+        "unmodified",
+        "modified",
+        "deleted"
+    };
+
     //- Reduction operator for PackedList of fileState
     class reduceFileStates
     {

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H

@@ -51,6 +51,12 @@ SeeAlso
 namespace Foam
 {
 
+// Forward declaration
+class PackedBoolList;
+
+//- @typedef A List of PackedBoolList
+typedef List<PackedBoolList> PackedBoolListList;
+
 /*---------------------------------------------------------------------------*\
                        Class PackedBoolList Declaration
 \*---------------------------------------------------------------------------*/

src/OpenFOAM/containers/Lists/UList/UList.H

@@ -59,6 +59,7 @@ template<class T> class SubList;
 template<class T> class UList;
 template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
 
+typedef UList<label> labelUList;
 
 /*---------------------------------------------------------------------------*\
                            Class UList Declaration

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C

@@ -32,13 +32,17 @@ License
 
 defineTypeNameAndDebug(Foam::UPstream, 0);
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
+    {
         "blocking",
         "scheduled",
         "nonBlocking"
-};
+    };
+}
+
 
 const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
     Foam::UPstream::commsTypeNames;

src/OpenFOAM/db/Time/Time.C

@@ -32,27 +32,30 @@ License
 
 defineTypeNameAndDebug(Foam::Time, 0);
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
+    {
         "endTime",
         "noWriteNow",
         "writeNow",
         "nextWrite"
-};
+    };
 
-const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
+    template<>
-    Foam::Time::stopAtControlNames_;
+    const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
-
+    {
-template<>
-const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
-{
         "timeStep",
         "runTime",
         "adjustableRunTime",
         "clockTime",
         "cpuTime"
-};
+    };
+}
+
+const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
+    Foam::Time::stopAtControlNames_;
 
 const Foam::NamedEnum<Foam::Time::writeControls, 5>
     Foam::Time::writeControlNames_;

src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C

@@ -27,16 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum
+{
-<
+    template<>
+    const char* Foam::NamedEnum
+    <
         Foam::outputFilterOutputControl::outputControls,
         2
->::names[] =
+    >::names[] =
-{
+    {
         "timeStep",
         "outputTime"
-};
+    };
+}
 
 const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 2>
     Foam::outputFilterOutputControl::outputControlNames_;

src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H

@@ -42,7 +42,7 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-class lduScheduleEntry;
+struct lduScheduleEntry;
 Ostream& operator<<(Ostream& os, const lduScheduleEntry& lb);
 
 

src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C

@@ -44,16 +44,20 @@ namespace Foam
 
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, word);
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, dictionary);
-}
 
-template<>
+    template<>
-const char* Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>::names[] =
+    const char* Foam::NamedEnum
-{
+    <
+        Foam::cyclicPolyPatch::transformType,
+        4
+    >::names[] =
+    {
         "unknown",
         "rotational",
         "translational",
         "noOrdering"
-};
+    };
+}
 
 const Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>
     Foam::cyclicPolyPatch::transformTypeNames;

src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C

@@ -49,7 +49,7 @@ Foam::PatchTools::sortedEdgeFaces
     const Field<PointType>& localPoints = p.localPoints();
 
     // create the lists for the various results. (resized on completion)
-    labelListList& sortedEdgeFaces = labelListList(edgeFaces.size());
+    labelListList sortedEdgeFaces(edgeFaces.size());
 
     forAll(edgeFaces, edgeI)
     {

src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C

@@ -29,27 +29,29 @@ License
 
 Foam::scalar Foam::intersection::planarTol_ = 0.2;
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
+    {
         "vector",
         "contactSphere"
-};
+    };
 
-const Foam::NamedEnum<Foam::intersection::direction, 2>
+    template<>
-Foam::intersection::directionNames_;
+    const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
-
+    {
-template<>
-const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
-{
         "fullRay",
         "halfRay",
         "visible"
-};
+    };
+}
+
+const Foam::NamedEnum<Foam::intersection::direction, 2>
+Foam::intersection::directionNames_;
 
 const Foam::NamedEnum<Foam::intersection::algorithm, 3>
 Foam::intersection::algorithmNames_;
 
 
-
 // ************************************************************************* //

src/OpenFOAM/primitives/Lists/boolList.H

@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::boolUList
+
+Description
+    A UList of bool
+
 Typedef
     Foam::boolList
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<bool> boolUList;
+
     typedef List<bool> boolList;
     typedef List<List<bool> > boolListList;
 }

src/OpenFOAM/primitives/Lists/fileNameList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::fileNameUList
+
+Description
+    A UList of fileNames.
+
 Typedef
     Foam::fileNameList
 
 Description
-    List of fileNames.
+    A List of fileNames.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<fileName> fileNameUList;
+
     typedef List<fileName> fileNameList;
 }
 

src/OpenFOAM/primitives/Lists/labelList.H

@@ -25,7 +25,19 @@ Typedef
     Foam::labelList
 
 Description
-    Label container classes
+    A List of labels
+
+Typedef
+    Foam::labelListList
+
+Description
+    A List of labelList
+
+Typedef
+    Foam::labelListListList
+
+Description
+    A List of labelListList
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,11 +51,11 @@ Description
 
 namespace Foam
 {
+    // Note: frequently used UList version is located in container itself
+
     typedef List<label> labelList;
     typedef List<labelList> labelListList;
     typedef List<labelListList> labelListListList;
-
-    typedef UList<label> unallocLabelList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/primitives/Lists/scalarList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::scalarUList
+
+Description
+    A UList of scalars.
+
 Typedef
     Foam::scalarList
 
 Description
-    List of scalars.
+    A List of scalars.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<scalar> scalarUList;
+
     typedef List<scalar> scalarList;
     typedef List<scalarList> scalarListList;
 }

src/OpenFOAM/primitives/Lists/sphericalTensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::sphericalTensorUList
+
+Description
+    A UList of sphericalTensors.
+
 Typedef
     Foam::sphericalTensorList
 
 Description
-    List of sphericalTensors.
+    A List of sphericalTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<sphericalTensor> sphericalTensorUList;
+
     typedef List<sphericalTensor> sphericalTensorList;
 }
 

src/OpenFOAM/primitives/Lists/stringList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::stringUList
+
+Description
+    A UList of strings.
+
 Typedef
     Foam::stringList
 
 Description
-    List of strings.
+    A List of strings.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<string> stringUList;
+
     typedef List<string> stringList;
 }
 

src/OpenFOAM/primitives/Lists/symmTensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::symmTensorUList
+
+Description
+    A UList of symmTensors.
+
 Typedef
     Foam::symmTensorList
 
 Description
-    List of symmTensors.
+    A List of symmTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<symmTensor> symmTensorUList;
+
     typedef List<symmTensor> symmTensorList;
 }
 

src/OpenFOAM/primitives/Lists/tensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::tensorUList
+
+Description
+    A UList of tensors.
+
 Typedef
     Foam::tensorList
 
 Description
-    List of tensors.
+    A List of tensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<tensor> tensorUList;
+
     typedef List<tensor> tensorList;
 }
 

src/OpenFOAM/primitives/Lists/vectorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::vectorUList
+
+Description
+    A UList of vectors.
+
 Typedef
     Foam::vectorList
 
 Description
-    List of vectors.
+    A List of vectors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<vector> vectorUList;
+
     typedef List<vector> vectorList;
 }
 

src/OpenFOAM/primitives/Lists/wordList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordUList
+
+Description
+    A UList of words.
+
 Typedef
     Foam::wordList
 
 Description
-    List of words.
+    A List of words.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<word> wordUList;
+
     typedef List<word> wordList;
 }
 

src/OpenFOAM/primitives/Lists/wordReList.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordReUList
+
+Description
+    A UList of wordRe (word or regular expression)
+
 Typedef
     Foam::wordReList
 
 Description
-    List of wordRe (word or regular expression)
+    A List of wordRe (word or regular expression)
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<wordRe> wordReUList;
+
     typedef List<wordRe> wordReList;
 }
 

src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C

@@ -28,32 +28,35 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* const Foam::labelTensor::typeName = "labelTensor";
-
-template<>
-const char* Foam::labelTensor::componentNames[] =
 {
+    template<>
+    const char* const Foam::labelTensor::typeName = "labelTensor";
+
+    template<>
+    const char* Foam::labelTensor::componentNames[] =
+    {
         "xx", "xy", "xz",
         "yx", "yy", "yz",
         "zx", "zy", "zz"
-};
+    };
 
-template<>
+    template<>
-const Foam::labelTensor Foam::labelTensor::zero
+    const Foam::labelTensor Foam::labelTensor::zero
-(
+    (
         0, 0, 0,
         0, 0, 0,
         0, 0, 0
-);
+    );
 
-template<>
+    template<>
-const Foam::labelTensor Foam::labelTensor::one
+    const Foam::labelTensor Foam::labelTensor::one
-(
+    (
         1, 1, 1,
         1, 1, 1,
         1, 1, 1
-);
+    );
+}
 
 
 // ************************************************************************* //

src/OpenFOAM/primitives/Vector/labelVector/labelVector.C

@@ -27,17 +27,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* const Foam::labelVector::typeName = "labelVector";
+{
+    template<>
+    const char* const Foam::labelVector::typeName = "labelVector";
 
-template<>
+    template<>
-const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
+    const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
 
-template<>
+    template<>
-const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
+    const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
-
-template<>
-const Foam::labelVector Foam::labelVector::one(1, 1, 1);
 
+    template<>
+    const Foam::labelVector Foam::labelVector::one(1, 1, 1);
+}
 
 // ************************************************************************* //

src/OpenFOAM/primitives/strings/wordRe/wordRe.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/primitives/strings/wordRe/wordRe.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/primitives/strings/wordRe/wordReI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/dynamicMesh/meshCut/directions/directions.C

@@ -35,19 +35,21 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
+    {
         "tan1",
         "tan2",
         "normal"
-};
+    };
+}
 
 const Foam::NamedEnum<Foam::directions::directionType, 3>
     Foam::directions::directionTypeNames_;
 
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // For debugging

src/dynamicMesh/slidingInterface/slidingInterface.C

@@ -45,15 +45,18 @@ namespace Foam
         slidingInterface,
         dictionary
     );
-}
 
-
+    template<>
-template<>
+    const char* Foam::NamedEnum
-const char* Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>::names[] =
+    <
-{
+        Foam::slidingInterface::typeOfMatch,
+        2
+    >::names[] =
+    {
         "integral",
         "partial"
-};
+    };
+}
 
 
 const Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>

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

@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Namespace
+    Foam::porousMedia
+
+Description
+    Namespace for models related to porous media
+
 Class
     Foam::porousZone
 

src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C

@@ -27,15 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+    {
         "gas",
         "liquid",
         "solid",
         "unknown"
-};
+    };
-
+}
 
 const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
     Foam::phaseProperties::phaseTypeNames_;

src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C

@@ -34,15 +34,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char*
-Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
 {
+    template<>
+    const char*
+    Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
+    {
         "inside",
         "outside",
         "insidePoint",
         "none"
-};
+    };
+}
+
 
 const Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>
     Foam::refinementSurfaces::areaSelectionAlgoNames;

src/meshTools/sets/cellSources/faceToCell/faceToCell.C

@@ -33,13 +33,18 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
 
-defineTypeNameAndDebug(faceToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
+    {
-
+        "neighbour",
-addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
+        "owner",
-
+        "any",
+        "all"
+    };
 }
 
 
@@ -51,15 +56,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
     " of the faces in the faceSet or where all faces are in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
-{
-    "neighbour",
-    "owner",
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
     Foam::faceToCell::faceActionNames_;
 

src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C

@@ -32,13 +32,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceZoneToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
 
-defineTypeNameAndDebug(faceZoneToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
+    {
-
+        "master",
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
+        "slave"
-
+    };
 }
 
 
@@ -51,14 +54,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
 );
 
 
-template<>
-const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
-{
-    "master",
-    "slave"
-};
-
-
 const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
     Foam::faceZoneToCell::faceActionNames_;
 

src/meshTools/sets/cellSources/pointToCell/pointToCell.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
 
-defineTypeNameAndDebug(pointToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
+    {
-
+        "any"
-addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
+    };
-
 }
 
 
@@ -50,13 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
     "    Select all cells with any point in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
-{
-    "any"
-};
-
-
 const Foam::NamedEnum<Foam::pointToCell::pointAction, 1>
     Foam::pointToCell::pointActionNames_;
 

src/meshTools/sets/faceSources/cellToFace/cellToFace.C

@@ -34,13 +34,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
 
-defineTypeNameAndDebug(cellToFace, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
+    {
-
+        "all",
-addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
+        "both"
-
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
     "           -both: faces where both neighbours are in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
-{
-    "all",
-    "both"
-};
-
 const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
     Foam::cellToFace::cellActionNames_;
 

src/meshTools/sets/faceSources/pointToFace/pointToFace.C

@@ -33,13 +33,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
 
-defineTypeNameAndDebug(pointToFace, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
+    {
-
+        "any",
-addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
+        "all"
-
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
     "    -all points in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
-{
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::pointToFace::pointAction, 2>
     Foam::pointToFace::pointActionNames_;
 

src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
 
-defineTypeNameAndDebug(cellToPoint, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
+    {
-
+        "all"
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
+    };
-
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
     "    Select all points of cells in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
     Foam::cellToPoint::cellActionNames_;
 

src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
 
-defineTypeNameAndDebug(faceToPoint, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
+    {
-
+        "all"
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
+    };
-
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
     "    Select all points of faces in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
     Foam::faceToPoint::faceActionNames_;
 

src/meshTools/sets/topoSetSource/topoSetSource.C

@@ -34,14 +34,10 @@ namespace Foam
     defineTypeNameAndDebug(topoSetSource, 0);
     defineRunTimeSelectionTable(topoSetSource, word);
     defineRunTimeSelectionTable(topoSetSource, istream);
-}
 
-
+    template<>
-Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = NULL;
+    const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
-
+    {
-template<>
-const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
-{
         "clear",
         "new",
         "invert",
@@ -50,7 +46,11 @@ const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
         "subset",
         "list",
         "remove"
-};
+    };
+}
+
+
+Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = NULL;
 
 
 const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>

src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C

@@ -49,17 +49,19 @@ namespace Foam
         distributedTriSurfaceMesh,
         dict
     );
-}
 
-
+    template<>
-template<>
+    const char* Foam::NamedEnum
-const char*
+    <
-Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>::names[] =
+        Foam::distributedTriSurfaceMesh::distributionType,
-{
+        3
+    >::names[] =
+    {
         "follow",
         "independent",
         "frozen"
-};
+    };
+}
 
 const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
     Foam::distributedTriSurfaceMesh::distributionTypeNames_;

src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C

@@ -27,12 +27,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
+    {
         "iteration",
         "time"
-};
+    };
+}
+
 
 const Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>
     Foam::fieldAverageItem::baseTypeNames_;

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C

@@ -33,13 +33,15 @@ License
 
 defineTypeNameAndDebug(Foam::fieldMinMax, 0);
 
-
+namespace Foam
-template<>
-const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
+    {
         "magnitude",
         "component"
-};
+    };
+}
 
 
 const Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>

src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C

@@ -37,13 +37,21 @@ defineTypeNameAndDebug(Foam::abortCalculation, 0);
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::abortCalculation::actionType, 3>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum
+    <
+       Foam::abortCalculation::actionType,
+       3
+    >::names[] =
+    {
         "noWriteNow",
         "writeNow",
         "nextWrite"
-};
+    };
+}
+
 
 const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
     Foam::abortCalculation::actionTypeNames_;

src/sampling/sampledSet/coordSet/coordSet.C

@@ -27,15 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
+    {
         "xyz",
         "x",
         "y",
         "z",
         "distance"
-};
+    };
+}
+
 
 const Foam::NamedEnum<Foam::coordSet::coordFormat, 5>
     Foam::coordSet::coordFormatNames_;

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C

@@ -32,6 +32,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace porousMedia
 {
     defineTypeNameAndDebug(fixedTemperature, 0);
 
@@ -42,11 +44,12 @@ namespace Foam
         pZone
     );
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fixedTemperature::fixedTemperature(const porousZone& pZone)
+Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone)
 :
     thermalModel(pZone, typeName),
     T_(readScalar(coeffDict_.lookup("T")))
@@ -55,13 +58,13 @@ Foam::fixedTemperature::fixedTemperature(const porousZone& pZone)
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::fixedTemperature::~fixedTemperature()
+Foam::porousMedia::fixedTemperature::~fixedTemperature()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fixedTemperature::addEnthalpySource
+void Foam::porousMedia::fixedTemperature::addEnthalpySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H

@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fixedTemperature
+    Foam::porousMedia::fixedTemperature
 
 Description
-    Fixed temperature model
+    Fixed temperature model for porous media
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,6 +40,8 @@ Description
 
 namespace Foam
 {
+namespace porousMedia
+{
 
 /*---------------------------------------------------------------------------*\
                       Class fixedTemperature Declaration
@@ -86,6 +88,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C

@@ -32,6 +32,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace porousMedia
 {
    defineTypeNameAndDebug(noThermalModel, 0);
 
@@ -42,11 +44,12 @@ namespace Foam
        pZone
    );
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::noThermalModel::noThermalModel(const porousZone& pZone)
+Foam::porousMedia::noThermalModel::noThermalModel(const porousZone& pZone)
 :
     thermalModel(pZone)
 {}
@@ -54,13 +57,13 @@ Foam::noThermalModel::noThermalModel(const porousZone& pZone)
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::noThermalModel::~noThermalModel()
+Foam::porousMedia::noThermalModel::~noThermalModel()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::noThermalModel::addEnthalpySource
+void Foam::porousMedia::noThermalModel::addEnthalpySource
 (
     const basicThermo&,
     const volScalarField&,

src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H

@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::noThermalModel
+    Foam::porousMedia::noThermalModel
 
 Description
-    Dummy model for 'none' option
+    A dummy thermal model porous media, corresponding to the 'none' option
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,6 +40,8 @@ Description
 
 namespace Foam
 {
+namespace porousMedia
+{
 
 /*---------------------------------------------------------------------------*\
                        Class noThermalModel Declaration
@@ -59,7 +61,7 @@ public:
     // Constructors
 
         //- Construct from porous zone
-        noThermalModel(const porousZone& pZone);
+        noThermalModel(const porousZone&);
 
 
     //- Destructor
@@ -78,6 +80,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C

@@ -28,22 +28,25 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace porousMedia
 {
    defineTypeNameAndDebug(thermalModel, 0);
    defineRunTimeSelectionTable(thermalModel, pZone);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermalModel::thermalModel(const porousZone& pZone)
+Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone)
 :
     pZone_(pZone),
     coeffDict_(dictionary::null)
 {}
 
 
-Foam::thermalModel::thermalModel
+Foam::porousMedia::thermalModel::thermalModel
 (
     const porousZone& pZone,
     const word& modelType
@@ -56,7 +59,7 @@ Foam::thermalModel::thermalModel
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::thermalModel::~thermalModel()
+Foam::porousMedia::thermalModel::~thermalModel()
 {}
 
 

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H

@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermalModel
+    Foam::porousMedia::thermalModel
 
 Description
-    Base class for selecting the temperature specification models
+    Base class to select the temperature specification models for porousMedia
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,8 +43,12 @@ Description
 namespace Foam
 {
 
+// Forward declaration of classes
 class basicThermo;
 
+namespace porousMedia
+{
+
 /*---------------------------------------------------------------------------*\
                         Class thermalModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -84,10 +88,10 @@ public:
     // Constructors
 
         //- Construct null from porous zone
-        thermalModel(const porousZone& pZone);
+        thermalModel(const porousZone&);
 
         //- Construct from porous zone and model type name
-        thermalModel(const porousZone& pZone, const word& modelType);
+        thermalModel(const porousZone&, const word& modelType);
 
 
     //- Destructor
@@ -95,7 +99,7 @@ public:
 
 
     //- Selector
-    static autoPtr<thermalModel> New(const porousZone& pZone);
+    static autoPtr<thermalModel> New(const porousZone&);
 
 
     // Member Functions
@@ -110,6 +114,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C

@@ -27,7 +27,8 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
+Foam::autoPtr<Foam::porousMedia::thermalModel>
+Foam::porousMedia::thermalModel::New
 (
     const porousZone& pZone
 )
@@ -43,7 +44,7 @@ Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
     {
         FatalErrorIn
         (
-            "thermalModel::New(const porousZone&)"
+            "porousMedia::thermalModel::New(const porousZone&)"
         )   << "Unknown thermalModel type "
             << modelType << nl << nl
             << "Valid thermalModel types are :" << endl
@@ -51,7 +52,7 @@ Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
             << abort(FatalError);
     }
 
-    return autoPtr<thermalModel>(cstrIter()(pZone));
+    return autoPtr<porousMedia::thermalModel>(cstrIter()(pZone));
 }
 
 

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C

@@ -38,7 +38,7 @@ Foam::thermalPorousZone::thermalPorousZone
 )
 :
     porousZone(key, mesh, dict),
-    model_(thermalModel::New(*this))
+    model_(porousMedia::thermalModel::New(*this))
 {}
 
 

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H

@@ -68,7 +68,7 @@ class thermalPorousZone
         void operator=(const thermalPorousZone&);
 
         //- Thermal model
-        autoPtr<thermalModel> model_;
+        autoPtr<porousMedia::thermalModel> model_;
 
 
 public:

src/transportModels/twoPhaseInterfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C

@@ -33,20 +33,20 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
-}
 
-template<>
+    template<>
-const char* Foam::NamedEnum
+    const char* Foam::NamedEnum
-<
+    <
         Foam::alphaContactAngleFvPatchScalarField::limitControls,
         4
->::names[] =
+    >::names[] =
-{
+    {
         "none",
         "gradient",
         "zeroGradient",
         "alpha"
-};
+    };
+}
 
 const Foam::NamedEnum
 <

wmake/rules/linux64Clang/c

@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = clang -m64
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

wmake/rules/linux64Clang/c++

@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
+
+CC          = clang++ -m64
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-60
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed

wmake/rules/linux64Clang/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline

wmake/rules/linux64Clang/c++Opt

@@ -0,0 +1,3 @@
+#c++DBUG     = -O0 -DFULLDEBUG -g
+c++DBUG     =
+c++OPT      = -O3

wmake/rules/linux64Clang/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/linux64Clang/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions

wmake/rules/linux64Clang/cOpt

@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3

wmake/rules/linux64Clang/cProf

@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2

wmake/rules/linux64Clang/general

@@ -0,0 +1,8 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++

wmake/rules/linux64Clang/mplibHPMPI

@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi

wmake/rules/linuxClang/c

@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = clang -m32
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

wmake/rules/linuxClang/c++

@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = clang++ -m32
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-60
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed

wmake/rules/linuxClang/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline

wmake/rules/linuxClang/c++Opt

@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3

wmake/rules/linuxClang/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/linuxClang/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions

wmake/rules/linuxClang/cOpt

@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3

wmake/rules/linuxClang/cProf

@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2

wmake/rules/linuxClang/general

@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++

wmake/rules/linuxClang/mplibHPMPI

@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi