From 4512dbdf584e07acaec4fc86f25985446fc89aa7 Mon Sep 17 00:00:00 2001
From: James Harrison <jch1g10@soton.ac.uk>
Date: Mon, 27 Mar 2017 15:02:16 +0100
Subject: [PATCH] Rename module ScalarFV to ScalarVP

---
 extras/Hadrons/Modules.hpp                    |  2 +-
 .../MScalar/{ScalarFV.cc => ScalarVP.cc}      | 27 ++++++++++---------
 .../MScalar/{ScalarFV.hpp => ScalarVP.hpp}    | 22 ++++++++-------
 extras/Hadrons/modules.inc                    |  4 +--
 4 files changed, 29 insertions(+), 26 deletions(-)
 rename extras/Hadrons/Modules/MScalar/{ScalarFV.cc => ScalarVP.cc} (54%)
 rename extras/Hadrons/Modules/MScalar/{ScalarFV.hpp => ScalarVP.hpp} (69%)

diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp
index b482eded..c1d90e3a 100644
--- a/extras/Hadrons/Modules.hpp
+++ b/extras/Hadrons/Modules.hpp
@@ -9,7 +9,7 @@
 #include <Grid/Hadrons/Modules/MScalar/ChargedProp.hpp>
 #include <Grid/Hadrons/Modules/MScalar/FreeProp.hpp>
 #include <Grid/Hadrons/Modules/MScalar/Scalar.hpp>
-#include <Grid/Hadrons/Modules/MScalar/ScalarFV.hpp>
+#include <Grid/Hadrons/Modules/MScalar/ScalarVP.hpp>
 #include <Grid/Hadrons/Modules/MSolver/RBPrecCG.hpp>
 #include <Grid/Hadrons/Modules/MSource/Point.hpp>
 #include <Grid/Hadrons/Modules/MSource/SeqGamma.hpp>
diff --git a/extras/Hadrons/Modules/MScalar/ScalarFV.cc b/extras/Hadrons/Modules/MScalar/ScalarVP.cc
similarity index 54%
rename from extras/Hadrons/Modules/MScalar/ScalarFV.cc
rename to extras/Hadrons/Modules/MScalar/ScalarVP.cc
index 2a50a62f..dff636dd 100644
--- a/extras/Hadrons/Modules/MScalar/ScalarFV.cc
+++ b/extras/Hadrons/Modules/MScalar/ScalarVP.cc
@@ -1,31 +1,32 @@
-#include <Grid/Hadrons/Modules/MScalar/ScalarFV.hpp>
+#include <Grid/Hadrons/Modules/MScalar/ScalarVP.hpp>
 
 using namespace Grid;
 using namespace Hadrons;
 using namespace MScalar;
 
 /******************************************************************************
-*                  TScalarFV implementation                             *
+*                  TScalarVP implementation                             *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
-TScalarFV::TScalarFV(const std::string name)
-: Module<ScalarFVPar>(name)
+TScalarVP::TScalarVP(const std::string name)
+: Module<ScalarVPPar>(name)
 {}
 
 // dependencies/products ///////////////////////////////////////////////////////
-std::vector<std::string> TScalarFV::getInput(void)
+std::vector<std::string> TScalarVP::getInput(void)
 {
-	std::string prop0Name = par().scalarProp + "_0";
-	std::string propD1Name = par().scalarProp + "_D1";
-    std::string propD1D1Name = par().scalarProp + "_D1D1";
-    std::string propD2Name = par().scalarProp + "_D2";
+    prop0Name_ = par().scalarProp + "_0";
+	propD1Name_ = par().scalarProp + "_D1";
+    propD1D1Name_ = par().scalarProp + "_D1D1";
+    propD2Name_ = par().scalarProp + "_D2";
     std::vector<std::string> in = {par().source, par().emField, par().scalarProp,
-    								prop0Name, propD1Name, propD1D1Name, propD2Name};
+    								prop0Name_, propD1Name_, propD1D1Name_,
+    								propD2Name_};
     
     return in;
 }
 
-std::vector<std::string> TScalarFV::getOutput(void)
+std::vector<std::string> TScalarVP::getOutput(void)
 {
     std::vector<std::string> out = {getName()};
     
@@ -33,13 +34,13 @@ std::vector<std::string> TScalarFV::getOutput(void)
 }
 
 // setup ///////////////////////////////////////////////////////////////////////
-void TScalarFV::setup(void)
+void TScalarVP::setup(void)
 {
 
 }
 
 // execution ///////////////////////////////////////////////////////////////////
-void TScalarFV::execute(void)
+void TScalarVP::execute(void)
 {
 
 }
diff --git a/extras/Hadrons/Modules/MScalar/ScalarFV.hpp b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp
similarity index 69%
rename from extras/Hadrons/Modules/MScalar/ScalarFV.hpp
rename to extras/Hadrons/Modules/MScalar/ScalarVP.hpp
index fda174db..3c3be434 100644
--- a/extras/Hadrons/Modules/MScalar/ScalarFV.hpp
+++ b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp
@@ -1,5 +1,5 @@
-#ifndef Hadrons_ScalarFV_hpp_
-#define Hadrons_ScalarFV_hpp_
+#ifndef Hadrons_ScalarVP_hpp_
+#define Hadrons_ScalarVP_hpp_
 
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>
@@ -8,14 +8,14 @@
 BEGIN_HADRONS_NAMESPACE
 
 /******************************************************************************
- *                         ScalarFV                                 *
+ *                         ScalarVP                                 *
  ******************************************************************************/
 BEGIN_MODULE_NAMESPACE(MScalar)
 
-class ScalarFVPar: Serializable
+class ScalarVPPar: Serializable
 {
 public:
-    GRID_SERIALIZABLE_CLASS_MEMBERS(ScalarFVPar,
+    GRID_SERIALIZABLE_CLASS_MEMBERS(ScalarVPPar,
                                     std::string, emField,
                                     std::string, source,
                                     std::string, scalarProp,
@@ -23,7 +23,7 @@ public:
                                     std::string, output);
 };
 
-class TScalarFV: public Module<ScalarFVPar>
+class TScalarVP: public Module<ScalarVPPar>
 {
 public:
     SCALAR_TYPE_ALIASES(SIMPL,);
@@ -31,9 +31,9 @@ public:
     typedef PhotonR::GaugeLinkField EmComp;
 public:
     // constructor
-    TScalarFV(const std::string name);
+    TScalarVP(const std::string name);
     // destructor
-    virtual ~TScalarFV(void) = default;
+    virtual ~TScalarVP(void) = default;
     // dependency relation
     virtual std::vector<std::string> getInput(void);
     virtual std::vector<std::string> getOutput(void);
@@ -41,12 +41,14 @@ public:
     virtual void setup(void);
     // execution
     virtual void execute(void);
+private:
+    std::string  prop0Name_, propD1Name_, propD1D1Name_, propD2Name_;
 };
 
-MODULE_REGISTER_NS(ScalarFV, TScalarFV, MScalar);
+MODULE_REGISTER_NS(ScalarVP, TScalarVP, MScalar);
 
 END_MODULE_NAMESPACE
 
 END_HADRONS_NAMESPACE
 
-#endif // Hadrons_ScalarFV_hpp_
+#endif // Hadrons_ScalarVP_hpp_
diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc
index f368bbdc..383cb6b5 100644
--- a/extras/Hadrons/modules.inc
+++ b/extras/Hadrons/modules.inc
@@ -5,7 +5,7 @@ modules_cc =\
   Modules/MGauge/Unit.cc \
   Modules/MScalar/ChargedProp.cc \
   Modules/MScalar/FreeProp.cc \
-  Modules/MScalar/ScalarFV.cc
+  Modules/MScalar/ScalarVP.cc
 
 modules_hpp =\
   Modules/MAction/DWF.hpp \
@@ -19,7 +19,7 @@ modules_hpp =\
   Modules/MScalar/ChargedProp.hpp \
   Modules/MScalar/FreeProp.hpp \
   Modules/MScalar/Scalar.hpp \
-  Modules/MScalar/ScalarFV.hpp \
+  Modules/MScalar/ScalarVP.hpp \
   Modules/MSolver/RBPrecCG.hpp \
   Modules/MSource/Point.hpp \
   Modules/MSource/SeqGamma.hpp \