From 727ea48e0ce06c7a30b116a4d5a9ed9e3a7d89cd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 29 May 2020 15:55:56 +0200
Subject: [PATCH] STYLE: include scalar.H instead of
 floatScalar.H/doubleScalar.H separately

STYLE: adjust code comments
---
 applications/test/DiagTensor/Test-DiagTensor.C               | 3 +--
 applications/test/SphericalTensor/Test-SphericalTensor.C     | 3 +--
 applications/test/SphericalTensor2D/Test-SphericalTensor2D.C | 3 +--
 applications/test/SymmTensor/Test-SymmTensor.C               | 3 +--
 applications/test/SymmTensor2D/Test-SymmTensor2D.C           | 3 +--
 applications/test/Tensor/Test-Tensor.C                       | 3 +--
 applications/test/Tensor2D/Test-Tensor2D.C                   | 3 +--
 src/OpenFOAM/db/error/error.H                                | 1 +
 src/OpenFOAM/db/error/errorManip.H                           | 2 +-
 src/OpenFOAM/db/error/messageStream.H                        | 2 +-
 10 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/applications/test/DiagTensor/Test-DiagTensor.C b/applications/test/DiagTensor/Test-DiagTensor.C
index 48b68be74c..f810193dd5 100644
--- a/applications/test/DiagTensor/Test-DiagTensor.C
+++ b/applications/test/DiagTensor/Test-DiagTensor.C
@@ -42,8 +42,7 @@ Description
 #include "SymmTensor.H"
 #include "SphericalTensor.H"
 #include "DiagTensor.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/SphericalTensor/Test-SphericalTensor.C b/applications/test/SphericalTensor/Test-SphericalTensor.C
index 79f2b9d738..05ebd8c3f7 100644
--- a/applications/test/SphericalTensor/Test-SphericalTensor.C
+++ b/applications/test/SphericalTensor/Test-SphericalTensor.C
@@ -42,8 +42,7 @@ Description
 #include "SymmTensor.H"
 #include "SphericalTensor.H"
 #include "DiagTensor.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/SphericalTensor2D/Test-SphericalTensor2D.C b/applications/test/SphericalTensor2D/Test-SphericalTensor2D.C
index 00d17610dc..d86207a622 100644
--- a/applications/test/SphericalTensor2D/Test-SphericalTensor2D.C
+++ b/applications/test/SphericalTensor2D/Test-SphericalTensor2D.C
@@ -41,8 +41,7 @@ Description
 #include "Tensor2D.H"
 #include "SymmTensor2D.H"
 #include "SphericalTensor2D.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/SymmTensor/Test-SymmTensor.C b/applications/test/SymmTensor/Test-SymmTensor.C
index 35da47cd8a..f1ecdf0342 100644
--- a/applications/test/SymmTensor/Test-SymmTensor.C
+++ b/applications/test/SymmTensor/Test-SymmTensor.C
@@ -43,8 +43,7 @@ Description
 #include "symmTensor.H"
 #include "transform.H"
 #include "Random.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/SymmTensor2D/Test-SymmTensor2D.C b/applications/test/SymmTensor2D/Test-SymmTensor2D.C
index 8b0485132c..d4a96eeffb 100644
--- a/applications/test/SymmTensor2D/Test-SymmTensor2D.C
+++ b/applications/test/SymmTensor2D/Test-SymmTensor2D.C
@@ -43,8 +43,7 @@ Description
 #include "symmTensor2D.H"
 #include "transform.H"
 #include "Random.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/Tensor/Test-Tensor.C b/applications/test/Tensor/Test-Tensor.C
index d9142c467d..05504bd3c8 100644
--- a/applications/test/Tensor/Test-Tensor.C
+++ b/applications/test/Tensor/Test-Tensor.C
@@ -44,8 +44,7 @@ Description
 #include "tensor.H"
 #include "transform.H"
 #include "Random.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/applications/test/Tensor2D/Test-Tensor2D.C b/applications/test/Tensor2D/Test-Tensor2D.C
index 6563a8cb9c..1ab50b0176 100644
--- a/applications/test/Tensor2D/Test-Tensor2D.C
+++ b/applications/test/Tensor2D/Test-Tensor2D.C
@@ -46,8 +46,7 @@ Description
 #include "symmTensor2D.H"
 #include "transform.H"
 #include "Random.H"
-#include "floatScalar.H"
-#include "doubleScalar.H"
+#include "scalar.H"
 #include "complex.H"
 
 using namespace Foam;
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 671ecbba17..6a9382a609 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -114,6 +114,7 @@ public:
 
     // Member Functions
 
+        //- The accumulated error message
         string message() const;
 
         //- Clear any messages
diff --git a/src/OpenFOAM/db/error/errorManip.H b/src/OpenFOAM/db/error/errorManip.H
index 7580eda0d0..2017ae69ff 100644
--- a/src/OpenFOAM/db/error/errorManip.H
+++ b/src/OpenFOAM/db/error/errorManip.H
@@ -55,7 +55,7 @@ Description
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 template<class Err> class errorManip;
 template<class Err> Ostream& operator<<(Ostream&, errorManip<Err>);
 
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index 7f1fcc92c9..abd624c3e2 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -86,7 +86,7 @@ public:
 
 protected:
 
-    // Private Data
+    // Protected Data
 
         string title_;
         errorSeverity severity_;