From 144505d9f240ffb4de9ddce4ed9734e9ec2e6f92 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 17 Jun 2016 17:07:42 +0100
Subject: [PATCH] Rename Maxwell to UpperConvectedMaxwell model

---
 src/transportModels/viscoelastic/Make/files   |  2 +-
 .../UpperConvectedMaxwell.C}                  | 18 +++++++++-----
 .../UpperConvectedMaxwell.H}                  | 24 +++++++++----------
 3 files changed, 25 insertions(+), 19 deletions(-)
 rename src/transportModels/viscoelastic/viscoelasticLaws/{Maxwell/Maxwell.C => UpperConvectedMaxwell/UpperConvectedMaxwell.C} (87%)
 rename src/transportModels/viscoelastic/viscoelasticLaws/{Maxwell/Maxwell.H => UpperConvectedMaxwell/UpperConvectedMaxwell.H} (85%)

diff --git a/src/transportModels/viscoelastic/Make/files b/src/transportModels/viscoelastic/Make/files
index e5cc118ae..ec0d90fad 100644
--- a/src/transportModels/viscoelastic/Make/files
+++ b/src/transportModels/viscoelastic/Make/files
@@ -6,7 +6,7 @@ viscoelasticLaws/viscoelasticLaw/newViscoelasticLaw.C
 viscoelasticLaws/LPTT/LPTT.C
 viscoelasticLaws/EPTT/EPTT.C
 viscoelasticLaws/Oldroyd-B/Oldroyd_B.C
-viscoelasticLaws/Maxwell/Maxwell.C
+viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.C
 viscoelasticLaws/Giesekus/Giesekus.C
 viscoelasticLaws/FENE-CR/FENE_CR.C
 viscoelasticLaws/FENE-P/FENE_P.C
diff --git a/src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.C b/src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.C
similarity index 87%
rename from src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.C
rename to src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.C
index e80c6cf10..971f43005 100644
--- a/src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.C
+++ b/src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.C
@@ -23,21 +23,26 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Maxwell.H"
+#include "UpperConvectedMaxwell.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(Maxwell, 0);
-    addToRunTimeSelectionTable(viscoelasticLaw, Maxwell, dictionary);
+    defineTypeNameAndDebug(UpperConvectedMaxwell, 0);
+    addToRunTimeSelectionTable
+    (
+        viscoelasticLaw,
+        UpperConvectedMaxwell,
+        dictionary
+    );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::Maxwell::Maxwell
+Foam::UpperConvectedMaxwell::UpperConvectedMaxwell
 (
     const word& name,
     const volVectorField& U,
@@ -67,7 +72,8 @@ Foam::Maxwell::Maxwell
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::fvVectorMatrix> Foam::Maxwell::divTau(volVectorField& U) const
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::UpperConvectedMaxwell::divTau(volVectorField& U) const
 {
     dimensionedScalar etaPEff = etaP_;
 
@@ -80,7 +86,7 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::Maxwell::divTau(volVectorField& U) const
 }
 
 
-void Foam::Maxwell::correct()
+void Foam::UpperConvectedMaxwell::correct()
 {
     // Velocity gradient tensor
     const tmp<volTensorField> tL = fvc::grad(U());
diff --git a/src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.H b/src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.H
similarity index 85%
rename from src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.H
rename to src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.H
index 4981f79b0..4bcaa4a19 100644
--- a/src/transportModels/viscoelastic/viscoelasticLaws/Maxwell/Maxwell.H
+++ b/src/transportModels/viscoelastic/viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.H
@@ -22,21 +22,21 @@ License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Maxwell
+    UpperConvectedMaxwell
 
 Description
-    Maxwell linear viscoelastic fluid model (Maxwell, J.C., 1867).
+    UpperConvectedMaxwell linear viscoelastic fluid model (UpperConvectedMaxwell, J.C., 1867).
 
 Author
     Jovani L. Favero.  All rights reserved
 
 SourceFiles
-    Maxwell.C
+    UpperConvectedMaxwell.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Maxwell_H
-#define Maxwell_H
+#ifndef UpperConvectedMaxwell_H
+#define UpperConvectedMaxwell_H
 
 #include "viscoelasticLaw.H"
 
@@ -46,10 +46,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class Maxwell Declaration
+                           Class UpperConvectedMaxwell Declaration
 \*---------------------------------------------------------------------------*/
 
-class Maxwell
+class UpperConvectedMaxwell
 :
     public viscoelasticLaw
 {
@@ -77,21 +77,21 @@ class Maxwell
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        Maxwell(const Maxwell&);
+        UpperConvectedMaxwell(const UpperConvectedMaxwell&);
 
         //- Disallow default bitwise assignment
-        void operator=(const Maxwell&);
+        void operator=(const UpperConvectedMaxwell&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("Maxwell");
+    TypeName("UpperConvectedMaxwell");
 
     // Constructors
 
         //- Construct from components
-        Maxwell
+        UpperConvectedMaxwell
         (
             const word& name,
             const volVectorField& U,
@@ -102,7 +102,7 @@ public:
 
     // Destructor
 
-        virtual ~Maxwell()
+        virtual ~UpperConvectedMaxwell()
         {}