STYLE: consistent '// End namespace' markers

applications/test/List/Test-List.C

@@ -64,7 +64,7 @@ public:
     using List<string>::List;
 };
 
-} // end namespace Foam
+} // End namespace Foam
 
 
 using namespace Foam;

applications/test/contiguous/Test-contiguous.C

@@ -50,7 +50,7 @@ namespace Foam
 // Wrong, but interesting to test
 // template<> struct contiguous<Pair<word>> : std::true_type {};
 
-} // end namespace Foam
+} // End namespace Foam
 
 using namespace Foam;
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H

@@ -80,8 +80,8 @@ bool writeCloudField
 );
 
 
-} // namespace ensightCloud
-} // namespace Foam
+} // End namespace ensightCloud
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H

@@ -72,8 +72,8 @@ bool writeCloudField
 );
 
 
-} // namespace ensightSerialCloud
-} // namespace Foam
+} // End namespace ensightSerialCloud
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OSspecific/POSIX/clockValue/clockValue.C

@@ -35,7 +35,7 @@ namespace
     constexpr int factorMicro = (1000000);
     constexpr int factorMicro2 = (500000);
 
-} // end of anonymous
+} // End anonymous namespace
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/OSspecific/POSIX/signals/sigStopAtWriteNow.C

@@ -76,7 +76,7 @@ addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_
     "stopAtWriteNowSignal"
 );
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/OSspecific/POSIX/signals/sigWriteNow.C

@@ -74,7 +74,7 @@ public:
 
 addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal");
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H

@@ -85,7 +85,7 @@ protected:
 
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H

@@ -87,7 +87,7 @@ protected:
 
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H

@@ -99,7 +99,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H

@@ -170,7 +170,7 @@ public:
 
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/memory/IListStream.H

@@ -121,7 +121,7 @@ public:
         }
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/memory/OCountStream.H

@@ -192,7 +192,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/memory/OListStream.H

@@ -361,7 +361,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/memory/UIListStream.H

@@ -191,7 +191,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/IOstreams/memory/UOListStream.H

@@ -164,7 +164,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C

@@ -44,7 +44,7 @@ namespace
             << "    " << msg << std::endl;
     }
 
-} // end of anonymous namespace
+} // End anonymous namespace
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H

@@ -43,7 +43,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class objectMap;
 inline bool operator==(const objectMap& a, const objectMap& b);
@@ -53,7 +53,7 @@ inline Istream& operator>>(Istream&, objectMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class objectMap Declaration
+                          Class objectMap Declaration
 \*---------------------------------------------------------------------------*/
 
 class objectMap
@@ -71,14 +71,14 @@ public:
 
     // Constructors
 
-        //- Null constructor for lists
+        //- Null constructor, with index=-1 and no objects
         inline objectMap();
 
         //- Construct from components
-        inline objectMap(const label index, const labelList& master);
+        inline objectMap(const label index, const UList<label>& master);
 
         //- Construct from Istream
-        inline objectMap(Istream&);
+        inline objectMap(Istream& is);
 
 
     // Member Functions
@@ -101,7 +101,6 @@ public:
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const objectMap&);
-
         friend Istream& operator>>(Istream&, objectMap&);
 };
 

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H

@@ -21,68 +21,58 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline objectMap::objectMap()
+inline Foam::objectMap::objectMap()
 :
     index_(-1),
-    masterObjects_(0)
+    masterObjects_()
 {}
 
 
-inline objectMap::objectMap(const label index, const labelList& master)
+inline Foam::objectMap::objectMap(const label index, const UList<label>& master)
 :
     index_(index),
     masterObjects_(master)
 {}
 
 
-inline objectMap::objectMap(Istream& is)
+inline Foam::objectMap::objectMap(Istream& is)
 {
-    // Read beginning of objectMap
     is.readBegin("objectMap");
 
     is >> index_ >> static_cast<labelList&>(masterObjects_);
 
-    // Read master of objectMap
     is.readEnd("objectMap");
-
     is.check(FUNCTION_NAME);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-label& objectMap::index()
+Foam::label& Foam::objectMap::index()
 {
     return index_;
 }
 
 
-inline label objectMap::index() const
+inline Foam::label Foam::objectMap::index() const
 {
     return index_;
 }
 
 
-inline labelList& objectMap::masterObjects()
+inline Foam::labelList& Foam::objectMap::masterObjects()
 {
     return masterObjects_;
 }
 
 
-inline const labelList& objectMap::masterObjects() const
+inline const Foam::labelList& Foam::objectMap::masterObjects() const
 {
     return masterObjects_;
 }
@@ -90,7 +80,7 @@ inline const labelList& objectMap::masterObjects() const
 
 // * * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * //
 
-inline bool operator==(const objectMap& a, const objectMap& b)
+inline bool Foam::operator==(const objectMap& a, const objectMap& b)
 {
     return
     (
@@ -99,15 +89,15 @@ inline bool operator==(const objectMap& a, const objectMap& b)
 }
 
 
-inline bool operator!=(const objectMap& a, const objectMap& b)
+inline bool Foam::operator!=(const objectMap& a, const objectMap& b)
 {
-    return (!(a == b));
+    return !(a == b);
 }
 
 
 // * * * * * * * * * * * * * * * Ostream Operator *  * * * * * * * * * * * * //
 
-inline Ostream& operator<<(Ostream& os, const objectMap& a)
+inline Foam::Ostream& Foam::operator<<(Ostream& os, const objectMap& a)
 {
     os  << token::BEGIN_LIST
         << a.index_ << token::SPACE
@@ -119,10 +109,10 @@ inline Ostream& operator<<(Ostream& os, const objectMap& a)
 }
 
 
-inline Istream& operator>>(Istream& is, objectMap& a)
+inline Foam::Istream& Foam::operator>>(Istream& is, objectMap& a)
 {
     is.readBegin("objectMap");
-    is  >> a.index_ >> a.masterObjects_;
+    is >> a.index_ >> a.masterObjects_;
     is.readEnd("objectMap");
 
     is.check(FUNCTION_NAME);
@@ -130,8 +120,4 @@ inline Istream& operator>>(Istream& is, objectMap& a)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // Master namespace Foam
-
 // ************************************************************************* //

src/OpenFOAM/primitives/strings/stringOps/stringOps.C

@@ -165,7 +165,7 @@ static void expandLeading(std::string& s)
     }
 }
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 //! \cond fileScope

src/conversion/ccm/reader/ccmReader.H

@@ -186,7 +186,8 @@ class reader
     protected fileFormats::STARCDCore
 {
 public:
-    // Forward Declarations
+
+    // Forward declarations
     class options;
 
 

src/fileFormats/stl/STLAsciiParseManual.C

@@ -135,8 +135,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

src/fileFormats/stl/STLAsciiParseRagel.C

@@ -126,8 +126,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

src/fileFormats/stl/STLAsciiParseRagel.rl

@@ -181,8 +181,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

src/fileFormats/stl/STLReader.H

@@ -49,10 +49,11 @@ namespace Foam
 namespace Detail
 {
 
-// Forward Declarations
+// Forward declarations
 class STLAsciiParse;
 
-}
+} // End namespace Detail
+
 
 namespace fileFormats
 {

src/functionObjects/field/externalCoupled/externalCoupled.C

@@ -46,8 +46,8 @@ namespace functionObjects
         externalCoupled,
         dictionary
     );
-}
-}
+} // End namespace functionObject
+} // End namespace Foam
 
 Foam::string Foam::functionObjects::externalCoupled::patchKey = "// Patch:";
 
@@ -78,8 +78,7 @@ static void writeList(Ostream& os, const string& header, const UList<T>& L)
 }
 //! \endcond
 
-}
-// namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H

@@ -128,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/lumpedPointMotion/lumpedPointMovement.C

@@ -78,8 +78,7 @@ static void writeList(Ostream& os, const string& header, const UList<T>& lst)
 }
 //! \endcond
 
-}
-// namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H

@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H

@@ -118,7 +118,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/bezier/bezier.H

@@ -121,7 +121,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/lineEdge/lineEdge.H

@@ -93,7 +93,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H

@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H

@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C

@@ -73,8 +73,8 @@ void kinematicSingleLayer::constrainFilmField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
-} // end namespace regionModels
-} // end namespace surfaceFilmModels
+} // End namespace Foam
+} // End namespace regionModels
+} // End namespace surfaceFilmModels
 
 // ************************************************************************* //

src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C

@@ -68,8 +68,8 @@ void filmViscosityModel::info(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //

src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C

@@ -65,8 +65,8 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //

src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C

@@ -126,8 +126,8 @@ void phaseChangeModel::info(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //

src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C

@@ -64,8 +64,8 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //

src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C

@@ -864,8 +864,8 @@ tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
-} // end namespace regionModels
-} // end namespace surfaceFilmModels
+} // End namespace Foam
+} // End namespace regionModels
+} // End namespace surfaceFilmModels
 
 // ************************************************************************* //

src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C

@@ -354,8 +354,8 @@ void thermalBaffle::info()