From 8da169897224443b254955be5552125cede82ef1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 14 Jan 2014 15:06:29 +0000
Subject: [PATCH 1/3] PV reader: filter the version more generally

---
 .../utilities/postProcessing/graphics/PV3Readers/Allwmake       | 2 +-
 .../utilities/postProcessing/graphics/PV4Readers/Allwmake       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
index 54026dc9ef..fd2375c4d0 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 #set -x
 
-if [ "$ParaView_VERSION" != "4.0.1" ]
+if [ "$ParaView_MAJOR" == "3.12" -o "$ParaView_MAJOR" == "3.14" ]
     then
     if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
     then
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
index a165c8d474..533d85583b 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 #set -x
 
-if [ "$ParaView_VERSION" == "4.0.1" -o "$ParaView_VERSION" == "4.1.0" ]
+if [ "$ParaView_MAJOR" == "4.0" -o "$ParaView_MAJOR" == "4.1" ]
     then
     if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
     then

From 5d42ab9a89f8547efe3f2eb01c550749d791e091 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 14 Jan 2014 15:06:59 +0000
Subject: [PATCH 2/3] makeSolidChemistrySolvers: Correct the typeName function
 resolution to account for the template arguments.

---
 .../solidChemistrySolver/makeSolidChemistrySolverType.H    | 7 ++++---
 .../solidChemistrySolver/makeSolidChemistrySolvers.C       | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index 915f77e950..865b41435d 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,8 @@ namespace Foam
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
         SS##Schem##Comp##SThermo##GThermo,                                    \
-        (#SS"<" + word(Schem::typeName_()) + "<"#Comp"," + SThermo::typeName()\
+        (#SS"<" + word(Schem<Comp, SThermo, GThermo>::typeName_())            \
+      + "<"#Comp"," + SThermo::typeName()                                     \
       + ","  + GThermo::typeName() + ">>").c_str(),                           \
         0                                                                     \
     );                                                                        \
@@ -82,7 +83,7 @@ namespace Foam
         Comp,                                                                 \
         SThermo,                                                              \
         GThermo                                                               \
-    );                                                                        \
+    );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
index f1eab789ca..1385d63243 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
@@ -57,7 +57,6 @@ namespace Foam
         hExpKappaConstSolidThermoPhysics,
         gasHThermoPhysics
     )
-
 }
 
 

From 7884c3f4366f1993b6f1183a1a38f9e6cc9687df Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 14 Jan 2014 15:08:05 +0000
Subject: [PATCH 3/3] Update header

---
 .../solidChemistrySolver/makeSolidChemistrySolvers.C            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
index 1385d63243..7d0f5d255d 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License