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

applications/solvers/combustion/PDRFoam/Make/files

@@ -1,25 +1,25 @@
 XiModels/XiModel/XiModel.C
-XiModels/XiModel/newXiModel.C
+XiModels/XiModel/XiModelNew.C
 XiModels/fixed/fixed.C
 XiModels/algebraic/algebraic.C
 XiModels/transport/transport.C
 
 XiModels/XiEqModels/XiEqModel/XiEqModel.C
-XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
 XiModels/XiEqModels/Gulder/Gulder.C
 XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
 XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
 XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
 
 XiModels/XiGModels/XiGModel/XiGModel.C
-XiModels/XiGModels/XiGModel/newXiGModel.C
+XiModels/XiGModels/XiGModel/XiGModelNew.C
 XiModels/XiGModels/KTS/KTS.C
 XiModels/XiGModels/instabilityG/instabilityG.C
 
 PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
 
 PDRModels/dragModels/PDRDragModel/PDRDragModel.C
-PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
 PDRModels/dragModels/basic/basic.C
 
 PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C

applications/solvers/combustion/fireFoam/combustionModels/Make/files

@@ -1,5 +1,5 @@
 combustionModel/combustionModel.C
-combustionModel/newCombustionModel.C
+combustionModel/combustionModelNew.C
 
 infinitelyFastChemistry/infinitelyFastChemistry.C
 

applications/solvers/multiphase/interPhaseChangeFoam/Make/files

@@ -1,6 +1,6 @@
 interPhaseChangeFoam.C
 phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
-phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
 phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
 phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
 phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C

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

@@ -28,7 +28,7 @@ Description
 
 SourceFiles
     phaseChangeTwoPhaseMixture.C
-    newPhaseChangeModel.C
+    phaseChangeModelNew.C
 
 \*---------------------------------------------------------------------------*/
 

applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C

@@ -50,7 +50,7 @@ Istream& operator>>
     alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
 )
 {
-    is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
+    is  >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
     return is;
 }
 

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files

@@ -1,5 +1,5 @@
 dragModels/dragModel/dragModel.C
-dragModels/dragModel/newDragModel.C
+dragModels/dragModel/dragModelNew.C
 dragModels/Ergun/Ergun.C
 dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
 dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H

@@ -28,7 +28,7 @@ Description
 
 SourceFiles
     dragModel.C
-    newDragModel.C
+    dragModelNew.C
 
 \*---------------------------------------------------------------------------*/
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files

@@ -1,32 +1,32 @@
 kineticTheoryModel/kineticTheoryModel.C
 
 viscosityModel/viscosityModel/viscosityModel.C
-viscosityModel/viscosityModel/newViscosityModel.C
+viscosityModel/viscosityModel/viscosityModelNew.C
 viscosityModel/Gidaspow/GidaspowViscosity.C
 viscosityModel/Syamlal/SyamlalViscosity.C
 viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
 viscosityModel/none/noneViscosity.C
 
 conductivityModel/conductivityModel/conductivityModel.C
-conductivityModel/conductivityModel/newConductivityModel.C
+conductivityModel/conductivityModel/conductivityModelNew.C
 conductivityModel/Gidaspow/GidaspowConductivity.C
 conductivityModel/Syamlal/SyamlalConductivity.C
 conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
 
 radialModel/radialModel/radialModel.C
-radialModel/radialModel/newRadialModel.C
+radialModel/radialModel/radialModelNew.C
 radialModel/CarnahanStarling/CarnahanStarlingRadial.C
 radialModel/Gidaspow/GidaspowRadial.C
 radialModel/LunSavage/LunSavageRadial.C
 radialModel/SinclairJackson/SinclairJacksonRadial.C
 
 granularPressureModel/granularPressureModel/granularPressureModel.C
-granularPressureModel/granularPressureModel/newGranularPressureModel.C
+granularPressureModel/granularPressureModel/granularPressureModelNew.C
 granularPressureModel/Lun/LunPressure.C
 granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
 
 frictionalStressModel/frictionalStressModel/frictionalStressModel.C
-frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C
 frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
 frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
 

applications/test/Dictionary/DictionaryTest.C

@@ -59,7 +59,7 @@ public:
 
     friend Ostream& operator<<(Ostream& os, const ent& e)
     {
-        os << e.keyword_ << ' ' << e.i_ << endl;
+        os  << e.keyword_ << ' ' << e.i_ << endl;
         return os;
     }
 };
@@ -88,7 +88,7 @@ public:
 
     friend Ostream& operator<<(Ostream& os, const Scalar& val)
     {
-        os << val.data_;
+        os  << val.data_;
         return os;
     }
 };

applications/test/Field/testField.H

@@ -38,7 +38,7 @@ public:
 
     friend std::ostream& operator<<(std::ostream& os, const Vector<C>& v)
     {
-        os << v.X << '\t' << v.Y << '\n';
+        os  << v.X << '\t' << v.Y << '\n';
         return os;
     }
 };

applications/test/HashTable/hashTableTest.C

@@ -89,7 +89,7 @@ int main()
 
     {
         OStringStream os;
-        os << table1;
+        os  << table1;
         HASHTABLE_CLASS<double> readTable(IStringStream(os.str())(), 100);
 
         Info<< "Istream constructor:" << readTable << endl;

applications/test/ISLList/ISLListTest.C

@@ -54,7 +54,7 @@ public:
 
     friend Ostream& operator<<(Ostream& os, const Scalar& s)
     {
-        os << s.data_;
+        os  << s.data_;
         return os;
     }
 

applications/test/PtrList/PtrListTest.C

@@ -60,7 +60,7 @@ public:
 
     friend Ostream& operator<<(Ostream& os, const Scalar& val)
     {
-        os << val.data_;
+        os  << val.data_;
         return os;
     }
 };

applications/test/StaticHashTable/staticHashTableTest.C

@@ -83,7 +83,7 @@ int main()
 
     {
         OStringStream os;
-        os << table1;
+        os  << table1;
         HASHTABLE_CLASS<double> readTable(IStringStream(os.str())(), 100);
 
         Info<< "Istream constructor:" << readTable << endl;

applications/test/UDictionary/UDictionaryTest.C

@@ -56,7 +56,7 @@ public:
 
     friend Ostream& operator<<(Ostream& os, const ent& e)
     {
-        os << e.keyword_ << ' ' << e.i_ << endl;
+        os  << e.keyword_ << ' ' << e.i_ << endl;
         return os;
     }
 };

applications/test/nearWallDist-wave/testWallDist2.C

@@ -176,8 +176,7 @@ int main(int argc, char *argv[])
 
             forAll(patchField, patchFaceI)
             {
-                label meshFaceI =
+                const label meshFaceI = patchField.patch().start() + patchFaceI;
-                    patchField.patch().patch().start() + patchFaceI;
 
                 scalar dist = faceInfo[meshFaceI].distSqr();
                 if (faceInfo[meshFaceI].valid())

applications/test/primitivePatch/testPrimitivePatch.C

@@ -47,8 +47,7 @@ void writeObj(Ostream& os,const pointField& points)
     {
         const point& pt = points[pointI];
 
-        os << "v " << pt.x() << ' ' << pt.y()
+        os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
-            << ' ' << pt.z() << endl;
     }
 }
 

applications/test/sha1/testSHA1.C

@@ -92,14 +92,14 @@ int main(int argc, char * argv[])
     {
         OSHA1stream os;
 
-        os << str;
+        os  << str;
         Info<< os.digest() << endl;
 
-        os << str;
+        os  << str;
         Info<< os.digest() << endl;
 
         os.rewind();
-        os << "The quick brown fox jumps over the lazy dog";
+        os  << "The quick brown fox jumps over the lazy dog";
         Info<< os.digest() << endl;
 
     }

applications/utilities/mesh/conversion/cfx4ToFoam/block.C

@@ -110,9 +110,9 @@ const labelListListList& block::boundaryPatches() const
 
 Ostream& operator<<(Ostream& os, const block& b)
 {
-    os << b.Vertices << nl
+    os  << b.Vertices << nl
-       << b.Cells << nl
+        << b.Cells << nl
-       << b.BoundaryPatches << endl;
+        << b.BoundaryPatches << endl;
 
     return os;
 }

applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C

@@ -57,7 +57,7 @@ void hexBlock::readPoints(Istream& is)
 {
     forAll(points_, i)
     {
-        is >> points_[i].x() >> points_[i].y() >> points_[i].z();
+        is  >> points_[i].x() >> points_[i].y() >> points_[i].z();
     }
 
     // Calculate the handedness of the block

applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C

@@ -128,13 +128,13 @@ void hexBlock::readPoints
     Info<< "Reading " << nPoints << " x coordinates..." << endl;
     for (label i=0; i < nPoints; i++)
     {
-        is >> points_[i].x();
+        is  >> points_[i].x();
     }
 
     Info<< "Reading " << nPoints << " y coordinates..." << endl;
     for (label i=0; i < nPoints; i++)
     {
-        is >> points_[i].y();
+        is  >> points_[i].y();
     }
 
     if (twoDThicknes > 0)
@@ -156,7 +156,7 @@ void hexBlock::readPoints
         Info<< "Reading " << nPoints << " z coordinates..." << endl;
         for (label i=0; i < nPoints; i++)
         {
-            is >> points_[i].z();
+            is  >> points_[i].z();
         }
     }
 
@@ -166,7 +166,7 @@ void hexBlock::readPoints
         Info<< "Reading " << nPoints << " blanks..." << endl;
         for (label i=0; i < nPoints; i++)
         {
-            is >> iBlank;
+            is  >> iBlank;
         }
     }
 

applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C

@@ -51,7 +51,7 @@ using namespace Foam;
 
 void writeOBJ(const point& pt, Ostream& os)
 {
-    os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
+    os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
 }
 
 // All edges of mesh

applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files

@@ -1,5 +1,5 @@
 extrudeModel/extrudeModel.C
-extrudeModel/newExtrudeModel.C
+extrudeModel/extrudeModelNew.C
 linearNormal/linearNormal.C
 linearDirection/linearDirection.C
 linearRadial/linearRadial.C

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

@@ -58,7 +58,7 @@ Foam::Ostream& Foam::operator<<
 
     if (faceI != -1)
     {
-        os<< " fc:" << c.patch_.localFaces()[faceI].centre(pts);
+        os  << " fc:" << c.patch_.localFaces()[faceI].centre(pts);
     }
     return os;
 }

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -974,7 +974,7 @@ int main(int argc, char *argv[])
             IStringStream is(rawLine + ' ');
 
             // Type: cellSet, faceSet, pointSet, faceZoneSet
-            is >> setType;
+            is  >> setType;
 
             stat = parseType(runTime, mesh, setType, is);
 

applications/utilities/mesh/manipulation/setSet/writeFuns.C

@@ -85,20 +85,20 @@ void Foam::writeFuns::write
             fField.size()*sizeof(float)
         );
 
-        os << std::endl;
+        os  << std::endl;
     }
     else
     {
         forAll(fField, i)
         {
-            os << fField[i] << ' ';
+            os  << fField[i] << ' ';
 
             if (i > 0 && (i % 10) == 0)
             {
-                os << std::endl;
+                os  << std::endl;
             }
         }
-        os << std::endl;
+        os  << std::endl;
     }
 }
 
@@ -134,20 +134,20 @@ void Foam::writeFuns::write
             elems.size()*sizeof(label)
         );
 
-        os << std::endl;
+        os  << std::endl;
     }
     else
     {
         forAll(elems, i)
         {
-            os << elems[i] << ' ';
+            os  << elems[i] << ' ';
 
             if (i > 0 && (i % 10) == 0)
             {
-                os << std::endl;
+                os  << std::endl;
             }
         }
-        os << std::endl;
+        os  << std::endl;
     }
 }
 

applications/utilities/postProcessing/dataConversion/foamToFieldview9/writeFunctions.C

@@ -85,12 +85,12 @@ void writeBytes(char* start, int nBytes)
 // Debug: write wall flags data
 void writeWallFlags(Ostream& os, label cellI, const labelList& wallFlags)
 {
-    os << "cell " << cellI << " wallsFlags:";
+    os  << "cell " << cellI << " wallsFlags:";
     forAll(wallFlags, wallFaceI)
     {
-        os << wallFlags[wallFaceI] << " ";
+        os  << wallFlags[wallFaceI] << ' ';
     }
-    os << endl;
+    os  << endl;
 }
 
 

applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C

@@ -99,12 +99,12 @@ void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
 {
     if (flds.size())
     {
-        os << msg;
+        os  << msg;
         forAll(flds, i)
         {
-            os<< ' ' << flds[i].name();
+            os  << ' ' << flds[i].name();
         }
-        os << endl;
+        os  << endl;
     }
 }
 
@@ -113,9 +113,9 @@ void print(Ostream& os, const wordList& flds)
 {
     forAll(flds, i)
     {
-        os<< ' ' << flds[i];
+        os  << ' ' << flds[i];
     }
-    os << endl;
+    os  << endl;
 }
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -163,12 +163,12 @@ void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
 {
     if (flds.size())
     {
-        os << msg;
+        os  << msg;
         forAll(flds, i)
         {
-            os<< ' ' << flds[i].name();
+            os  << ' ' << flds[i].name();
         }
-        os << endl;
+        os  << endl;
     }
 }
 
@@ -177,9 +177,9 @@ void print(Ostream& os, const wordList& flds)
 {
     forAll(flds, i)
     {
-        os<< ' ' << flds[i];
+        os  << ' ' << flds[i];
     }
-    os << endl;
+    os  << endl;
 }
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C

@@ -94,20 +94,20 @@ void Foam::writeFuns::write
             fField.size()*sizeof(float)
         );
 
-        os << std::endl;
+        os  << std::endl;
     }
     else
     {
         forAll(fField, i)
         {
-            os << fField[i] << ' ';
+            os  << fField[i] << ' ';
 
             if (i > 0 && (i % 10) == 0)
             {
-                os << std::endl;
+                os  << std::endl;
             }
         }
-        os << std::endl;
+        os  << std::endl;
     }
 }
 
@@ -143,20 +143,20 @@ void Foam::writeFuns::write
             elems.size()*sizeof(label)
         );
 
-        os << std::endl;
+        os  << std::endl;
     }
     else
     {
         forAll(elems, i)
         {
-            os << elems[i] << ' ';
+            os  << elems[i] << ' ';
 
             if (i > 0 && (i % 10) == 0)
             {
-                os << std::endl;
+                os  << std::endl;
             }
         }
-        os << std::endl;
+        os  << std::endl;
     }
 }
 
@@ -186,11 +186,11 @@ void Foam::writeFuns::writeHeader
 
     if (binary)
     {
-        os << "BINARY" << std::endl;
+        os  << "BINARY" << std::endl;
     }
     else
     {
-        os << "ASCII" << std::endl;
+        os  << "ASCII" << std::endl;
     }
 }
 

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx

@@ -502,15 +502,14 @@ void vtkPV3FoamReader::PrintSelf(ostream& os, vtkIndent indent)
     vtkDebugMacro(<<"PrintSelf");
 
     this->Superclass::PrintSelf(os,indent);
-    os<< indent << "File name: "
+    os  << indent << "File name: "
-      << (this->FileName ? this->FileName : "(none)") << "\n";
+        << (this->FileName ? this->FileName : "(none)") << "\n";
 
     foamData_->PrintSelf(os, indent);
 
-    os<< indent << "Time step range: "
+    os  << indent << "Time step range: "
-      << this->TimeStepRange[0] << " - " << this->TimeStepRange[1]
+        << this->TimeStepRange[0] << " - " << this->TimeStepRange[1] << "\n"
-      << "\n";
+        << indent << "Time step: " << this->GetTimeStep() << endl;
-    os<< indent << "Time step: " << this->GetTimeStep() << endl;
 }
 
 

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx

@@ -283,8 +283,8 @@ void vtkPV3blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
     vtkDebugMacro(<<"PrintSelf");
 
     this->Superclass::PrintSelf(os,indent);
-    os<< indent << "File name: "
+    os  << indent << "File name: "
-      << (this->FileName ? this->FileName : "(none)") << "\n";
+        << (this->FileName ? this->FileName : "(none)") << "\n";
 
     foamData_->PrintSelf(os, indent);
 }

applications/utilities/postProcessing/miscellaneous/postChannel/sumData.C

@@ -41,7 +41,7 @@ Foam::Ostream& Foam::operator<<
 
 Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::sumData& wDist)
 {
-    return is >> wDist.oldFace_ >> wDist.sum_ >> wDist.count_;
+    return is  >> wDist.oldFace_ >> wDist.sum_ >> wDist.count_;
 }
 
 

applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/files

@@ -1,5 +1,5 @@
 tabulatedWallFunction/tabulatedWallFunction.C
-tabulatedWallFunction/newTabulatedWallFunction.C
+tabulatedWallFunction/tabulatedWallFunctionNew.C
 
 SpaldingsLaw/SpaldingsLaw.C
 general/general.C

applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C

@@ -65,7 +65,7 @@ void writeOBJ(Ostream& os, const pointField& pts)
     {
         const point& pt = pts[i];
 
-        os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+        os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
 }
 
@@ -85,7 +85,7 @@ void dumpPoints(const triSurface& surf, const labelList& borderPoint)
         {
             const point& pt = surf.localPoints()[pointI];
 
-            os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+            os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
         }
     }
 }
@@ -108,7 +108,7 @@ void dumpEdges(const triSurface& surf, const boolList& borderEdge)
         {
             const edge& e = surf.edges()[edgeI];
 
-            os << "l " << e.start()+1 << ' ' << e.end()+1 << endl;
+            os  << "l " << e.start()+1 << ' ' << e.end()+1 << endl;
         }
     }
 }

applications/utilities/thermophysical/mixtureAdiabaticFlameT/substance.H

@@ -95,13 +95,13 @@ public:
 
         friend Istream& operator>>(Istream& is, substance& s)
         {
-            is >> s.name_ >> s.volFrac_;
+            is  >> s.name_ >> s.volFrac_;
             return is;
         }
 
         friend Ostream& operator<<(Ostream& os, const substance& s)
         {
-            os << s.name_ << token::SPACE << s.volFrac_;
+            os  << s.name_ << token::SPACE << s.volFrac_;
             return os;
         }
 };

doc/Allwmake

@@ -2,9 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-chmod a+rX $WM_PROJECT_DIR
+# fix permissions (NB: '+X' and not '+x'!)
-chmod a+rX $WM_PROJECT_DIR/doc
+chmod a+rX $WM_PROJECT_DIR $WM_PROJECT_DIR/doc Doxygen
-chmod -R a+rX Doxygen
 
 Doxygen/Allwmake
 

doc/Doxygen/Allwmake

@@ -2,11 +2,21 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+rm -rf latex man
+
+# remove html directory in background
+mv html html-stagedRemove$$ 2> /dev/null
+rm -rf html-stagedRemove$$ >/dev/null 2>&1 &
+
+# ensure that created files are readable by everyone
 umask 22
-rm -rf html latex man
 doxygen
 
 # fix permissions (NB: '+X' and not '+x'!)
-chmod -R a+rX ./
+chmod -R a+rX html latex man 2>/dev/null
+
+echo
+echo "Done doxygen"
+echo
 
 # ----------------------------------------------------------------- end-of-file

doc/Doxygen/FoamHeader.html

@@ -14,7 +14,9 @@
 <body>
 <a id="openfoam"> </a>
 <!-- Top banner -->
-<table style="border-width: 0px; width: 800px; background: #ddddff;" cellspacing=0 cellpadding=0>
+<table
+    style="border-width: 0px; width: 800px; background: #ddddff;"
+    cellspacing="0" cellpadding="0">
 <tr>
 <td style="width: 9px; height:54px"></td>
 <td style="width: 250px; height:54px; vertical-align:middle;
@@ -38,23 +40,23 @@ horizontal-align: left; ">
 <td valign="top">
     <table width="801" border="0" cellspacing="1" cellpadding="0" bgcolor="#ffffff">
     <tr>
-    <td class=leftmenu>&nbsp;
+    <td class="leftmenu">&nbsp;
         <a href="http://foam.sourceforge.net/doc/Doxygen/html"
             class="menuLefton">Source Guide</a>
     </td>
-    <td class=topmenu>
+    <td class="topmenu">
         <a href="http://www.openfoam.com/about/"
             class="menuTopoff">OpenCFD</a>
     </td>
-    <td class=topmenu>
+    <td class="topmenu">
         <a href="http://www.openfoam.com/features/"
             class="menuTopoff">Features</a>
     </td>
-    <td class=topmenu>
+    <td class="topmenu">
         <a href="http://www.openfoam.com/contact/"
             class="menuTopoff">Contact</a>
     </td>
-    <td class=topmenu>
+    <td class="topmenu">
         <a href="http://www.openfoam.com/"
             class="menuTopoff">OpenFOAM</a>
     </td>
@@ -64,6 +66,8 @@ horizontal-align: left; ">
 </td>
 </tr>
 </table>
-<table style="border-width: 0px; width: 800px; background: #ffffff;" cellspacing=5 cellpadding=0>
+<table
+    style="border-width: 0px; width: 800px; background: #ffffff;"
+    cellspacing="5" cellpadding="0">
 <tr>
 <td>

doc/Doxygen/tabs.css

@@ -1,101 +1,100 @@
 /* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
 
-DIV.tabs
+div.tabs
 {
-   float            : left;
+    float           : left;
-   width            : 100%;
+    width           : 100%;
-   margin-bottom    : 2px;
+    margin-bottom   : 2px;
-   padding-bottom   : 6px;
+    padding-bottom  : 6px;
 }
 
-DIV.tabs UL
+div.tabs ul
 {
-   margin           : 0px;
+    margin          : 0px;
-   padding-left     : 0px;
+    padding-left    : 0px;
-   border-right     : 1px solid #84B0C7;
+    border-right    : 1px solid #84B0C7;
-   list-style       : none;
+    list-style      : none;
 }
 
-DIV.tabs LI, DIV.tabs FORM
+div.tabs li, div.tabs form
 {
-   display          : inline;
+    display         : inline;
-   margin           : 0px;
+    margin          : 0px;
-   padding          : 0px;
+    padding         : 0px;
 }
 
-DIV.tabs FORM
+div.tabs form
 {
-   float            : left;
+    float           : left;
-   padding          : 0px 9px;
+    padding         : 0px 9px;
 }
 
-DIV.tabs A
+div.tabs a
 {
-   float            : left;
+    float           : left;
-   font-size        : 12px;
+    font-size       : 12px;
-   font-weight      : bold;
+    font-weight     : bold;
-   text-decoration  : none;
+    text-decoration : none;
-   border-right     : 1px solid #000000;
+    border-right    : 1px solid #000000;
 }
 
-DIV.tabs A:hover
+div.tabs a:hover
 {
-   background-position: 100% -150px;
+    background-position: 100% -150px;
 }
 
-DIV.tabs A:link, DIV.tabs A:visited,
+div.tabs a:link, div.tabs a:visited, div.tabs a:active, div.tabs a:hover
-DIV.tabs A:active, DIV.tabs A:hover
 {
-       color: #000000;
+    color           : #000000;
 }
 
-DIV.tabs SPAN
+div.tabs span
 {
-   float            : left;
+    float           : left;
-   display          : block;
+    display         : block;
-   padding          : 0px 9px;
+    padding         : 0px 9px;
-   white-space      : nowrap;
+    white-space     : nowrap;
 }
 
-DIV.tabs INPUT
+div.tabs input
 {
-   float            : right;
+    float           : right;
-   display          : inline;
+    display         : inline;
-   font-size        : 12px;
+    font-size       : 12px;
 }
 
-DIV.tabs TD
+div.tabs td
 {
-   font-size        : 12px;
+    font-size       : 12px;
-   font-weight      : bold;
+    font-weight     : bold;
-   text-decoration  : none;
+    text-decoration : none;
 }
 
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
+/* Commented backslash hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
+div.tabs span { float : none; }
 /* End IE5-Mac hack */
 
-DIV.tabs A:hover SPAN
+div.tabs a:hover span
 {
-   background-position: 0% -150px;
+    background-position: 0% -150px;
 }
 
-DIV.tabs LI#current A
+div.tabs li#current a
 {
-   border-width     : 0px;
+    border-width    : 0px;
-   border-right     : 1px solid #000000;
+    border-right    : 1px solid #000000;
-   color: #0000ff;
+    color           : #0000ff;
 }
 
-DIV.tabs LI#current SPAN
+div.tabs li#current span
 {
-   padding-bottom   : 0px;
+    padding-bottom  : 0px;
 }
 
-DIV.nav
+div.nav
 {
-   background       : none;
+    background      : none;
-   border           : none;
+    border          : none;
-   border-bottom    : 1px solid #000000;
+    border-bottom   : 1px solid #000000;
 }
 

doc/Doxygen/tools/find-its

@@ -1,48 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-its
-#
-# Description
-#     Search for *.[CH] files with "it's"
-#     This contraction (== "it is") looks too much like "its" (possesive)
-#     and confuses non-native (and some native) English speakers.
-#
-#     - print filename and lineNumber
-#
-# -----------------------------------------------------------------------------
-
-my $re_filespec = qr{^.+\.[CH]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    local @ARGV = $_;
-    while (<>) {
-        if (m{it\'s}) {
-            print "$File::Find::name  line=$.\n";
-        }
-    }
-
-    close ARGV;
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-

doc/tools/find-its

@@ -0,0 +1,17 @@
+#!/bin/sh
+# -----------------------------------------------------------------------------
+# Script
+#     find-its
+#
+# Description
+#     Search for files with "it's"
+#     This contraction (== "it is") looks too much like "its" (possesive)
+#     and confuses non-native (and some native) English speakers.
+#
+# -----------------------------------------------------------------------------
+set -x
+cd $WM_PROJECT_DIR || exit 1
+
+git grep -e "it's"
+
+#------------------------------------------------------------------ end-of-file

etc/settings.csh

@@ -75,7 +75,7 @@ _foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_LIBBI
 
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
-unset gcc_version gmp_version mpfr_version
+unset gcc_version gmp_version mpfr_version mpc_version
 unsetenv MPFR_ARCH_PATH
 
 
@@ -92,25 +92,22 @@ case OpenFOAM:
         set gmp_version=gmp-5.0.1
         set mpfr_version=mpfr-2.4.2
         breaksw
-
+    case Gcc45:
-    case Gcc442:
+        set gcc_version=gcc-4.5.0
-        set gcc_version=gcc-4.4.2
+        set gmp_version=gmp-5.0.1
-        set gmp_version=gmp-4.2.4
+        set mpfr_version=mpfr-2.4.2
-        set mpfr_version=mpfr-2.4.1
+        set mpc_version=mpc-2.4.2
         breaksw
-
     case Gcc44:
-        set gcc_version=gcc-4.4.2
+        set gcc_version=gcc-4.4.3
-        set gmp_version=gmp-4.2.4
+        set gmp_version=gmp-5.0.1
-        set mpfr_version=mpfr-2.4.1
+        set mpfr_version=mpfr-2.4.2
         breaksw
-
     case Gcc43:
         set gcc_version=gcc-4.3.3
         set gmp_version=gmp-4.2.4
         set mpfr_version=mpfr-2.4.1
         breaksw
-
     default:
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@@ -118,13 +115,13 @@ case OpenFOAM:
         echo "    Please check your settings"
         echo
         breaksw
-
     endsw
 
     if ( $?gcc_version ) then
         set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
         set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
         set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
+        set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
 
         # Check that the compiler directory can be found
         if ( ! -d "$gccDir" ) then
@@ -138,17 +135,30 @@ case OpenFOAM:
 
         _foamAddMan     $gccDir/man
         _foamAddPath    $gccDir/bin
-        _foamAddLib     $gccDir/lib${WM_COMPILER_LIB_ARCH}:$gccDir/lib
+
+        # 64-bit needs lib64, but 32-bit needs lib (not lib32)
+        if ( "$WM_ARCH_OPTION" = 64 ) then
+        then
+            _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
+        else
+            _foamAddLib     $gccDir/lib
+        endif
 
         # add in gmp/mpfr libraries
         _foamAddLib     $gmpDir/lib
         _foamAddLib     $mpfrDir/lib
 
+        # add in mpc libraries (not need for older gcc)
+        if ( $?mpc_version ) then
+        then
+            _foamAddLib     $mpcDir/lib
+        endif
+
         # used by boost/CGAL:
         setenv MPFR_ARCH_PATH $mpfrDir
     endif
-    unset gcc_version gccDir  gmp_version gmpDir  mpfr_version mpfrDir
+    unset gcc_version gccDir
-
+    unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
     breaksw
 endsw
 

etc/settings.sh

@@ -99,7 +99,8 @@ _foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_LIBBIN/dummy
 
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
-unset gcc_version gmp_version mpfr_version MPFR_ARCH_PATH
+unset gcc_version gmp_version mpfr_version mpc_version
+unset MPFR_ARCH_PATH
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,15 +115,16 @@ OpenFOAM)
         gmp_version=gmp-5.0.1
         mpfr_version=mpfr-2.4.2
         ;;
-    Gcc442)
+    Gcc45)
-        gcc_version=gcc-4.4.2
+        gcc_version=gcc-4.5.0
-        gmp_version=gmp-4.2.4
+        gmp_version=gmp-5.0.1
-        mpfr_version=mpfr-2.4.1
+        mpfr_version=mpfr-2.4.2
+        mpc_version=mpc-0.8.1
         ;;
     Gcc44)
-        gcc_version=gcc-4.4.2
+        gcc_version=gcc-4.4.3
-        gmp_version=gmp-4.2.4
+        gmp_version=gmp-5.0.1
-        mpfr_version=mpfr-2.4.1
+        mpfr_version=mpfr-2.4.2
         ;;
     Gcc43)
         gcc_version=gcc-4.3.3
@@ -143,6 +145,7 @@ OpenFOAM)
         gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
         gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
         mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
+        mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
 
         # Check that the compiler directory can be found
         [ -d "$gccDir" ] || {
@@ -156,22 +159,30 @@ OpenFOAM)
 
         _foamAddMan     $gccDir/man
         _foamAddPath    $gccDir/bin
-        _foamAddLib     $gccDir/lib
 
         # 64-bit needs lib64, but 32-bit needs lib (not lib32)
         if [ "$WM_ARCH_OPTION" = 64 ]
         then
             _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
+        else
+            _foamAddLib     $gccDir/lib
         fi
 
         # add in gmp/mpfr libraries
         _foamAddLib     $gmpDir/lib
         _foamAddLib     $mpfrDir/lib
 
+        # add in mpc libraries (not need for older gcc)
+        if [ -n "$mpc_version" ]
+        then
+            _foamAddLib     $mpcDir/lib
+        fi
+
         # used by boost/CGAL:
         export MPFR_ARCH_PATH=$mpfrDir
     fi
-    unset gcc_version gccDir  gmp_version gmpDir  mpfr_version mpfrDir
+    unset gcc_version gccDir
+    unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
     ;;
 esac
 

src/ODE/Make/files

@@ -6,7 +6,7 @@ ODESolversRK  =  ODESolvers/RK
 ODESolversSIBS  =  ODESolvers/SIBS
 
 $(ODESolversODESolver)/ODESolver.C
-$(ODESolversODESolver)/newODESolver.C
+$(ODESolversODESolver)/ODESolverNew.C
 
 $(ODESolversRK)/RK.C
 

src/OSspecific/POSIX/printStack.C

@@ -122,19 +122,18 @@ void printSourceFileAndLine
 
         if (line == "")
         {
-            os << " addr2line failed";
+            os  << " addr2line failed";
         }
         else if (line == "??:0")
         {
-            os << " in " << filename;
+            os  << " in " << filename;
         }
         else
         {
             string cwdLine(line.replaceAll(cwd() + '/', ""));
-
             string homeLine(cwdLine.replaceAll(home(), '~'));
 
-            os << " at " << homeLine.c_str();
+            os  << " at " << homeLine.c_str();
         }
     }
 }
@@ -160,11 +159,11 @@ void getSymbolForRaw
 
         if (fcnt != "")
         {
-            os << fcnt.c_str();
+            os  << fcnt.c_str();
             return;
         }
     }
-    os << "Uninterpreted: " << raw.c_str();
+    os  << "Uninterpreted: " << raw.c_str();
 }
 
 
@@ -210,8 +209,8 @@ void error::printStack(Ostream& os)
         fileName programFile;
         word address;
 
-        os << '#' << label(i) << "  ";
+        os  << '#' << label(i) << "  ";
-        //os << "Raw   : " << msg << "\n\t";
+        //os  << "Raw   : " << msg << "\n\t";
         {
             string::size_type lPos = msg.find('[');
             string::size_type rPos = msg.find(']');
@@ -263,12 +262,12 @@ void error::printStack(Ostream& os)
 
                 if (status == 0 && cplusNamePtr)
                 {
-                    os << cplusNamePtr;
+                    os  << cplusNamePtr;
                     free(cplusNamePtr);
                 }
                 else
                 {
-                    os << cName.c_str();
+                    os  << cName.c_str();
                 }
             }
             else
@@ -279,7 +278,7 @@ void error::printStack(Ostream& os)
                 {
                     string fullName(msg.substr(start, endBracketPos-start));
 
-                    os << fullName.c_str() << nl;
+                    os  << fullName.c_str() << nl;
                 }
                 else
                 {
@@ -296,7 +295,7 @@ void error::printStack(Ostream& os)
 
         printSourceFileAndLine(os, addressMap, programFile, address);
 
-        os << nl;
+        os  << nl;
     }
 
     free(strings);

src/OpenFOAM/Make/files

@@ -258,13 +258,13 @@ $(GAMG)/GAMGSolverSolve.C
 
 GAMGInterfaces = $(GAMG)/interfaces
 $(GAMGInterfaces)/GAMGInterface/GAMGInterface.C
-$(GAMGInterfaces)/GAMGInterface/newGAMGInterface.C
+$(GAMGInterfaces)/GAMGInterface/GAMGInterfaceNew.C
 $(GAMGInterfaces)/processorGAMGInterface/processorGAMGInterface.C
 $(GAMGInterfaces)/cyclicGAMGInterface/cyclicGAMGInterface.C
 
 GAMGInterfaceFields = $(GAMG)/interfaceFields
 $(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceField.C
-$(GAMGInterfaceFields)/GAMGInterfaceField/newGAMGInterfaceField.C
+$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceFieldNew.C
 $(GAMGInterfaceFields)/processorGAMGInterfaceField/processorGAMGInterfaceField.C
 $(GAMGInterfaceFields)/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
 
@@ -328,7 +328,7 @@ polyMesh = meshes/polyMesh
 
 polyPatches = $(polyMesh)/polyPatches
 $(polyPatches)/polyPatch/polyPatch.C
-$(polyPatches)/polyPatch/newPolyPatch.C
+$(polyPatches)/polyPatch/polyPatchNew.C
 
 basicPolyPatches = $(polyPatches)/basic
 $(basicPolyPatches)/coupled/coupledPolyPatch.C
@@ -362,15 +362,15 @@ $(zone)/zone.C
 
 cellZone = $(polyMesh)/zones/cellZone
 $(cellZone)/cellZone.C
-$(cellZone)/newCellZone.C
+$(cellZone)/cellZoneNew.C
 
 faceZone = $(polyMesh)/zones/faceZone
 $(faceZone)/faceZone.C
-$(faceZone)/newFaceZone.C
+$(faceZone)/faceZoneNew.C
 
 pointZone = $(polyMesh)/zones/pointZone
 $(pointZone)/pointZone.C
-$(pointZone)/newPointZone.C
+$(pointZone)/pointZoneNew.C
 
 $(polyMesh)/polyMesh.C
 $(polyMesh)/polyMeshFromShapeMesh.C
@@ -438,7 +438,7 @@ $(pointMeshMapper)/pointPatchMapper.C
 pointPatches = $(pointMesh)/pointPatches
 $(pointPatches)/pointPatch/pointPatch.C
 $(pointPatches)/facePointPatch/facePointPatch.C
-$(pointPatches)/facePointPatch/newFacePointPatch.C
+$(pointPatches)/facePointPatch/facePointPatchNew.C
 
 basicPointPatches = $(pointPatches)/basic
 $(basicPointPatches)/coupled/coupledPointPatch.C

src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C

@@ -61,9 +61,9 @@ Foam::IOstream::compressionType
 Foam::IOstream::compressionEnum(const word& compression)
 {
     // get Switch (bool) value, but allow it to fail
-    Switch::switchType sw = Switch::asEnum(compression, true);
+    Switch sw(compression, true);
 
-    if (sw != Switch::INVALID)
+    if (sw.valid())
     {
         return sw ? IOstream::COMPRESSED : IOstream::UNCOMPRESSED;
     }

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C

@@ -346,6 +346,6 @@ Ostream& operator<<
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "newPointPatchField.C"
+#include "pointPatchFieldNew.C"
 
 // ************************************************************************* //

src/OpenFOAM/global/foamDoc.H

@@ -40,8 +40,8 @@ License
 
     OpenFOAM comes with full commercial support from OpenCFD, including
     <a href="http://www.openfoam.com/support/software.php">software support</a>,
-    <a href="http://www.openfoam.com/support/development.php">contracted developments</a> 
+    <a href="http://www.openfoam.com/support/development.php">contracted developments</a>
-    and a programme of <a href="http://www.openfoam.com/training">training courses</a>.
+    and a programme of <a href="http://www.openfoam.com/training/">training courses</a>.
     These activities fund the development, maintenance and release of
     OpenFOAM to make it an extremely viable commercial open source product.
 

src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C

@@ -577,21 +577,56 @@ Foam::polyMesh::polyMesh
             << "Found " << nFaces - defaultPatchStart
             << " undefined faces in mesh; adding to default patch." << endl;
 
-        boundary_.set
+        // Check if there already exists a defaultFaces patch as last patch
-        (
+        // and reuse it.
-            nAllPatches,
+        label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
-            polyPatch::New
-            (
-                defaultBoundaryPatchType,
-                defaultBoundaryPatchName,
-                nFaces - defaultPatchStart,
-                defaultPatchStart,
-                boundary_.size() - 1,
-                boundary_
-            )
-        );
 
-        nAllPatches++;
+        if (patchI != -1)
+        {
+            if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
+            {
+                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                    << "Default patch " << boundary_[patchI].name()
+                    << " already has faces in it or is not"
+                    << " last in list of patches." << exit(FatalError);
+            }
+
+            WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+                << "Reusing existing patch " << patchI
+                << " for undefined faces." << endl;
+
+            boundary_.set
+            (
+                patchI,
+                polyPatch::New
+                (
+                    boundaryPatchTypes[patchI],
+                    boundaryPatchNames[patchI],
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    patchI,
+                    boundary_
+                )
+            );
+        }
+        else
+        {
+            boundary_.set
+            (
+                nAllPatches,
+                polyPatch::New
+                (
+                    defaultBoundaryPatchType,
+                    defaultBoundaryPatchName,
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    boundary_.size() - 1,
+                    boundary_
+                )
+            );
+
+            nAllPatches++;
+        }
     }
 
     // Reset the size of the boundary

src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C

@@ -71,7 +71,7 @@ void Foam::coupledPolyPatch::writeOBJ
     writeOBJ(os, p1);
     vertI++;
 
-    os<< "l " << vertI-1 << ' ' << vertI << nl;
+    os  << "l " << vertI-1 << ' ' << vertI << nl;
 }
 
 

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H

@@ -32,7 +32,7 @@ Description
 
 SourceFiles
     polyPatch.C
-    newPolyPatch.C
+    polyPatchNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H

@@ -34,7 +34,7 @@ Description
 
 SourceFiles
     cellZone.C
-    newCellZone.C
+    cellZoneNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H

@@ -33,7 +33,7 @@ Description
 
 SourceFiles
     faceZone.C
-    newFaceZone.C
+    faceZoneNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H

@@ -35,7 +35,7 @@ Description
 
 SourceFiles
     pointZone.C
-    newPointZone.C
+    pointZoneNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/OpenFOAM/primitives/bools/Switch/Switch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,23 +44,17 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
-Foam::Switch::switchType Foam::Switch::asEnum(const bool b)
-{
-    return b ? Switch::TRUE : Switch::FALSE;
-}
-
-
 Foam::Switch::switchType Foam::Switch::asEnum
 (
     const std::string& str,
     const bool allowInvalid
 )
 {
-    for (int sw = 0; sw < Switch::INVALID; sw++)
+    for (int sw = 0; sw < Switch::INVALID; ++sw)
     {
         if (str == names[sw])
         {
-            // convert n/y to no/yes (perhaps should deprecate y/n)
+            // convert n/y to no/yes - perhaps should deprecate y/n
             if (sw == Switch::NO_1 || sw == Switch::NONE)
             {
                 return Switch::NO;
@@ -78,57 +72,12 @@ Foam::Switch::switchType Foam::Switch::asEnum
 
     if (!allowInvalid)
     {
-        FatalErrorIn("Switch::asEnum(const std::string&)")
+        FatalErrorIn("Switch::asEnum(const std::string&, const bool)")
             << "unknown switch word " << str << nl
             << abort(FatalError);
     }
 
-    return INVALID;
+    return Switch::INVALID;
-}
-
-
-bool Foam::Switch::asBool(const switchType sw)
-{
-    // relies on (INVALID & 0x1) evaluating to false
-    return (sw & 0x1);
-}
-
-
-bool Foam::Switch::asBool
-(
-    const std::string& str,
-    const bool allowInvalid
-)
-{
-    // allow invalid values, but catch after for correct error message
-    switchType sw = asEnum(str, true);
-
-    if (sw == Switch::INVALID)
-    {
-        if (!allowInvalid)
-        {
-            FatalErrorIn("Switch::asBool(const std::string&)")
-                << "unknown switch word " << str << nl
-                << abort(FatalError);
-        }
-
-        return false;
-    }
-
-
-    return (sw & 0x1);
-}
-
-
-const char* Foam::Switch::asText(const bool b)
-{
-    return b ? names[Switch::TRUE] : names[Switch::FALSE];
-}
-
-
-const char* Foam::Switch::asText(const switchType sw)
-{
-    return names[sw];
 }
 
 
@@ -145,6 +94,18 @@ Foam::Switch Foam::Switch::lookupOrAddToDict
 
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
 
+bool Foam::Switch::valid() const
+{
+    return switch_ <= Switch::NONE;
+}
+
+
+const char* Foam::Switch::asText() const
+{
+    return names[switch_];
+}
+
+
 bool Foam::Switch::readIfPresent(const word& name, const dictionary& dict)
 {
     return dict.readIfPresent<Switch>(name, *this);

src/OpenFOAM/primitives/bools/Switch/Switch.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,11 +48,11 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class Switch;
+class dictionary;
 
 Istream& operator>>(Istream&, Switch&);
 Ostream& operator<<(Ostream&, const Switch&);
 
-class dictionary;
 
 /*---------------------------------------------------------------------------*\
                            Class Switch Declaration
@@ -60,8 +60,6 @@ class dictionary;
 
 class Switch
 {
-private:
-
     // Private data
 
         //- The logic and enumerated text representation stored as a single byte
@@ -71,19 +69,21 @@ public:
 
     // Public data types
 
+        // avoid issues with pre-processor defines
+        #undef FALSE
+        #undef TRUE
+        #undef OFF
+        #undef ON
+        #undef NO
+        #undef YES
+        #undef NO_1
+        #undef YES_1
+        #undef NONE
+        #undef PLACEHOLDER
+        #undef INVALID
+
         //- The various text representations for a switch value.
         //  These also correspond to the entries in names.
-#       undef FALSE
-#       undef TRUE
-#       undef OFF
-#       undef ON
-#       undef NO
-#       undef YES
-#       undef NO_1
-#       undef YES_1
-#       undef NONE
-#       undef PLACEHOLDER
-#       undef INVALID
         enum switchType
         {
             FALSE = 0,  TRUE  = 1,
@@ -94,7 +94,6 @@ public:
             INVALID
         };
 
-
     // Static data members
 
         //- The set of names corresponding to the switchType enumeration
@@ -102,36 +101,15 @@ public:
         static const char* names[INVALID+1];
 
 
+private:
+
     // Static Member Functions
 
-        //- Return a switchType representation of a bool
-        static switchType asEnum(const bool);
-
         //- Return a switchType representation of a word
-        //  Optionally allow bad words, and catch the error elsewhere
+        static switchType asEnum(const std::string&, const bool allowInvalid);
-        static switchType asEnum
-        (
-            const std::string&,
-            const bool allowInvalid=false
-        );
 
-        //- Return a bool representation of a switchType
-        static bool asBool(const switchType);
-
-        //- Return a bool representation of a word
-        //  Optionally allow bad words, and catch the error elsewhere
-        static bool asBool
-        (
-            const std::string&,
-            const bool allowInvalid=false
-        );
-
-        //- Return a text representation of a bool value
-        static const char* asText(const bool);
-
-        //- Return a text representation of a switchType
-        static const char* asText(const switchType);
 
+public:
 
     // Constructors
 
@@ -141,28 +119,36 @@ public:
             switch_(Switch::FALSE)
         {}
 
-        //- Construct from bool
+        //- Construct from enumerated value
-        Switch(const bool value)
+        Switch(const switchType sw)
         :
-            switch_(asEnum(value))
+            switch_(sw)
+        {}
+
+        //- Construct from bool
+        Switch(const bool b)
+        :
+            switch_(b ? Switch::TRUE : Switch::FALSE)
         {}
 
         //- Construct from integer values (treats integer as bool value)
-        Switch(const int value)
+        Switch(const int i)
         :
-            switch_(asEnum(bool(value)))
+            switch_(i ? Switch::TRUE : Switch::FALSE)
         {}
 
         //- Construct from std::string, string, word
-        Switch(const std::string& value)
+        //  Optionally allow bad words, and catch the error elsewhere
+        Switch(const std::string& str, const bool allowInvalid=false)
         :
-            switch_(asEnum(value))
+            switch_(asEnum(str, allowInvalid))
         {}
 
         //- Construct from character array
-        Switch(const char* value)
+        //  Optionally allow bad words, and catch the error elsewhere
+        Switch(const char* str, const bool allowInvalid=false)
         :
-            switch_(asEnum(std::string(value)))
+            switch_(asEnum(std::string(str), allowInvalid))
         {}
 
         //- Construct from Istream
@@ -178,6 +164,18 @@ public:
         );
 
 
+    // Member Functions
+
+        //- Return true if the Switch has a valid value
+        bool valid() const;
+
+        //- Return a text representation of the Switch
+        const char* asText() const;
+
+        //- Update the value of the Switch if it is found in the dictionary
+        bool readIfPresent(const word&, const dictionary&);
+
+
     // Member Operators
 
         //- Conversion to bool
@@ -186,6 +184,13 @@ public:
             return (switch_ & 0x1);
         }
 
+        //- Assignment from enumerated value
+        const Switch& operator=(const switchType sw)
+        {
+            switch_ = sw;
+            return *this;
+        }
+
         //- Assignment from bool
         const Switch& operator=(const bool b)
         {
@@ -194,12 +199,6 @@ public:
         }
 
 
-    // Member fuctions
-
-        //- Update the value of the Switch if it is found in the dictionary
-        bool readIfPresent(const word&, const dictionary&);
-
-
     // IOstream Operators
 
         friend Istream& operator>>(Istream&, Switch&);

src/OpenFOAM/primitives/bools/Switch/SwitchIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,26 +48,26 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 
     if (t.isLabel())
     {
-        s.switch_ = Switch::asEnum(bool(t.labelToken()));
+        s = bool(t.labelToken());
     }
     else if (t.isWord())
     {
         // allow invalid values, but catch after for correct error message
-        Switch::switchType sw = Switch::asEnum(t.wordToken(), true);
+        Switch sw(t.wordToken(), true);
 
-        if (sw == Switch::INVALID)
+        if (sw.valid())
+        {
+            s = sw;
+        }
+        else
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, Switch&)", is)
+            FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
                 << "expected 'true/false', 'on/off' ... found " << t.wordToken()
                 << exit(FatalIOError);
 
             return is;
         }
-        else
-        {
-            s.switch_ = sw;
-        }
     }
     else
     {

src/OpenFOAM/primitives/bools/bool/boolIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::Istream& Foam::operator>>(Istream& is, bool& b)
 Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
 {
     // we could also write as text string without any difficulty
-    // os << Switch::asText(b);
+    // os  << (b ? "true" : "false");
     os.write(label(b));
     os.check("Ostream& operator<<(Ostream&, const bool)");
     return os;
@@ -59,10 +59,10 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
 
 bool Foam::readBool(Istream& is)
 {
-    bool val;
+    bool b;
-    is >> val;
+    is  >> b;
 
-    return val;
+    return b;
 }
 
 

src/dynamicFvMesh/Make/files

@@ -1,5 +1,5 @@
 dynamicFvMesh/dynamicFvMesh.C
-dynamicFvMesh/newDynamicFvMesh.C
+dynamicFvMesh/dynamicFvMeshNew.C
 staticFvMesh/staticFvMesh.C
 dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C
 dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -8,7 +8,7 @@ dynamicRefineFvMesh/dynamicRefineFvMesh.C
 solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
 solidBodyMotionFunctions = solidBodyMotionFvMesh/solidBodyMotionFunctions
 $(solidBodyMotionFunctions)/solidBodyMotionFunction/solidBodyMotionFunction.C
-$(solidBodyMotionFunctions)/solidBodyMotionFunction/newSolidBodyMotionFunction.C
+$(solidBodyMotionFunctions)/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
 $(solidBodyMotionFunctions)/SDA/SDA.C
 $(solidBodyMotionFunctions)/tabulated6DoFMotion/tabulated6DoFMotion.C
 $(solidBodyMotionFunctions)/linearMotion/linearMotion.C

src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H

@@ -29,7 +29,7 @@ Description
 
 SourceFiles
     dynamicFvMesh.C
-    newDynamicFvMesh.C
+    dynamicFvMeshNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C

@@ -332,7 +332,7 @@ Foam::dynamicRefineFvMesh::refine
                 const fvsPatchScalarField& patchPhiU =
                     phiU.boundaryField()[patchI];
 
-                label faceI = patchPhi.patch().patch().start();
+                label faceI = patchPhi.patch().start();
 
                 forAll(patchPhi, i)
                 {

src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H

@@ -36,7 +36,7 @@ Description
 
 SourceFiles
     solidBodyMotionFunction.C
-    newDynamicFvMesh.C
+    dynamicFvMeshNew.C
 
 \*---------------------------------------------------------------------------*/
 

src/dynamicMesh/Make/files

@@ -19,7 +19,7 @@ $(enrichedPatch)/enrichedPatchMasterPoints.C
 
 polyMeshModifier = polyTopoChange/polyMeshModifier
 $(polyMeshModifier)/polyMeshModifier.C
-$(polyMeshModifier)/newPolyMeshModifier.C
+$(polyMeshModifier)/polyMeshModifierNew.C
 
 polyTopoChange/polyTopoChange/topoAction/topoActions.C
 polyTopoChange/polyTopoChanger/polyTopoChanger.C

src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C

@@ -186,7 +186,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
         forAll(bfld, patchI)
         {
             fvsPatchField<T>& patchFld = bfld[patchI];
-            label faceI = patchFld.patch().patch().start();
+            label faceI = patchFld.patch().start();
 
             forAll(patchFld, i)
             {