From 12e415330fa10903146236591431e37c3bebbb2c Mon Sep 17 00:00:00 2001
From: ferben <ferben@debian.felix.com>
Date: Wed, 13 Nov 2019 11:21:08 +0000
Subject: [PATCH] made notation DPar->dp consistent over modules

---
 Hadrons/Modules/MDistil/DistilVectors.hpp | 14 +++++++-------
 Hadrons/Modules/MDistil/Perambulator.hpp  | 14 +++++++-------
 Hadrons/modules.inc                       |  2 --
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Hadrons/Modules/MDistil/DistilVectors.hpp b/Hadrons/Modules/MDistil/DistilVectors.hpp
index 0cac9dfc..f34a883d 100644
--- a/Hadrons/Modules/MDistil/DistilVectors.hpp
+++ b/Hadrons/Modules/MDistil/DistilVectors.hpp
@@ -154,7 +154,7 @@ void TDistilVectors<FImpl>::execute(void)
     auto &noise        = envGet(NoiseTensor,  par().noise);
     auto &perambulator = envGet(PerambTensor, par().perambulator);
     auto &epack        = envGet(Grid::Hadrons::EigenPack<LatticeColourVector>, par().lapevec);
-    const DistilParameters &DPar{envGet(DistilParameters, par().DistilParams)};
+    const DistilParameters &dp{envGet(DistilParameters, par().DistilParams)};
     
     envGetTmp(LatticeSpinColourVector, source4d);
     envGetTmp(LatticeSpinColourVector, source3d);
@@ -167,12 +167,12 @@ void TDistilVectors<FImpl>::execute(void)
     const int Ntfirst{ grid4d->LocalStarts()[3] };
     
     const int Nt{env().getDim(Tdir)}; 
-    const int nvec{DPar.nvec}; 
-    const int nnoise{DPar.nnoise}; 
-    const int tsrc{DPar.tsrc}; 
-    const int TI{DPar.TI}; 
-    const int LI{DPar.LI}; 
-    const int SI{DPar.SI}; 
+    const int nvec{dp.nvec}; 
+    const int nnoise{dp.nnoise}; 
+    const int tsrc{dp.tsrc}; 
+    const int TI{dp.TI}; 
+    const int LI{dp.LI}; 
+    const int SI{dp.SI}; 
     const bool full_tdil{ TI == Nt }; 
     const int Nt_inv{ full_tdil ? 1 : TI };
     
diff --git a/Hadrons/Modules/MDistil/Perambulator.hpp b/Hadrons/Modules/MDistil/Perambulator.hpp
index a006abd5..40738865 100644
--- a/Hadrons/Modules/MDistil/Perambulator.hpp
+++ b/Hadrons/Modules/MDistil/Perambulator.hpp
@@ -128,14 +128,14 @@ void TPerambulator<FImpl>::setup(void)
 template <typename FImpl>
 void TPerambulator<FImpl>::execute(void)
 {
-    const DistilParameters &DPar{ envGet(DistilParameters, par().DistilParams) };
+    const DistilParameters &dp{ envGet(DistilParameters, par().DistilParams) };
     const int Nt{env().getDim(Tdir)};
-    const int nvec{DPar.nvec}; 
-    const int nnoise{DPar.nnoise}; 
-    const int tsrc{DPar.tsrc}; 
-    const int TI{DPar.TI}; 
-    const int LI{DPar.LI}; 
-    const int SI{DPar.SI}; 
+    const int nvec{dp.nvec}; 
+    const int nnoise{dp.nnoise}; 
+    const int tsrc{dp.tsrc}; 
+    const int TI{dp.TI}; 
+    const int LI{dp.LI}; 
+    const int SI{dp.SI}; 
     const bool full_tdil{ TI == Nt }; 
     const int Nt_inv{ full_tdil ? 1 : TI };
 
diff --git a/Hadrons/modules.inc b/Hadrons/modules.inc
index 30a7cc6d..1b35ec69 100644
--- a/Hadrons/modules.inc
+++ b/Hadrons/modules.inc
@@ -67,7 +67,6 @@ modules_cc =\
   Modules/MDistil/DistilVectors.cc \
   Modules/MDistil/DistilPar.cc \
   Modules/MDistil/LapEvec.cc \
-  Modules/MDistil/DistilParameters.cc \
   Modules/MDistil/Perambulator.cc \
   Modules/MDistil/Noises.cc \
   Modules/MAction/MobiusDWF.cc \
@@ -154,7 +153,6 @@ modules_hpp =\
   Modules/MDistil/LapEvec.hpp \
   Modules/MDistil/Perambulator.hpp \
   Modules/MDistil/DistilPar.hpp \
-  Modules/MDistil/DistilCommon.hpp \
   Modules/MAction/ZMobiusDWF.hpp \
   Modules/MAction/ScaledDWF.hpp \
   Modules/MAction/WilsonClover.hpp \