Reorganizing files

lib/lattice/Lattice_transfer.h

@@ -386,7 +386,7 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
   }
 
   // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  //PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);
@@ -428,7 +428,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
     }
   }
   // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  //PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);

lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h

@@ -158,8 +158,8 @@ namespace Grid {
 	X=zero;
 	DerivativeSolver(Mpc,PhiOdd,X);
 	Mpc.Mpc(X,Y);
-  	Mpc.MpcDeriv(tmp , Y, X );    dSdU=tmp;
+  Mpc.MpcDeriv(tmp , Y, X );    dSdU=tmp;
-        Mpc.MpcDagDeriv(tmp , X, Y);  dSdU=dSdU+tmp;
+  Mpc.MpcDagDeriv(tmp , X, Y);  dSdU=dSdU+tmp;
 
 	// Treat the EE case. (MdagM)^-1 = Minv Minvdag
 	// Deriv defaults to zero.

lib/qcd/hmc/HMCModules.h

@@ -30,92 +30,12 @@ directory
 #ifndef GRID_HMC_MODULES
 #define GRID_HMC_MODULES
 
+
+#include "HMC_GridModules.h"
+
 namespace Grid {
 namespace QCD {
 
-// call these: resources
-
-// Some modules for the basic setup
-
-
-///////////////////////////////////////////////////
-// Modules
-class GridModuleParameters: Serializable{
-  
-  GRID_SERIALIZABLE_CLASS_MEMBERS(GridModuleParameters,
-  std::string, lattice,
-  std::string,  mpi);
-
-public: 
-  // these namings are ugly
-  // also ugly the distinction between the serializable members
-  // and this
-  std::vector<int> lattice_v;
-  std::vector<int> mpi_v;
-
-  GridModuleParameters(const std::vector<int> l_ = std::vector<int>(),
-    const std::vector<int> mpi_ = std::vector<int>()):lattice_v(l_), mpi_v(mpi_){}
-
-  template <class ReaderClass>
-  GridModuleParameters(Reader<ReaderClass>& Reader) {
-    read(Reader, "LatticeGrid", *this);
-    lattice_v = strToVec<int>(lattice);
-    mpi_v = strToVec<int>(mpi);
-    if (mpi_v.size() != lattice_v.size()) {
-      std::cout << "Error in GridModuleParameters: lattice and mpi dimensions "
-                   "do not match"
-                << std::endl;
-      exit(1);
-    }
-  }
-};
-
-class GridModule {
- public:
-  GridCartesian* get_full() { 
-    std::cout << GridLogDebug << "Getting cartesian in module"<< std::endl;
-    return grid_.get(); }
-  GridRedBlackCartesian* get_rb() { 
-    std::cout << GridLogDebug << "Getting rb-cartesian in module"<< std::endl;
-    return rbgrid_.get(); }
-
-  void set_full(GridCartesian* grid) { grid_.reset(grid); }
-  void set_rb(GridRedBlackCartesian* rbgrid) { rbgrid_.reset(rbgrid); }
-
- protected:
-  std::unique_ptr<GridCartesian> grid_;
-  std::unique_ptr<GridRedBlackCartesian> rbgrid_;
-  
-};
-
-// helpers
-class GridFourDimModule : public GridModule {
- public:
-  // add a function to create the module from a Reader
-  GridFourDimModule() {
-    set_full(SpaceTimeGrid::makeFourDimGrid(
-        GridDefaultLatt(), GridDefaultSimd(4, vComplex::Nsimd()),
-        GridDefaultMpi()));
-    set_rb(SpaceTimeGrid::makeFourDimRedBlackGrid(grid_.get()));
-  }
-
-  template <class vector_type = vComplex>
-  GridFourDimModule(GridModuleParameters Params) {
-    if (Params.lattice_v.size() == 4) {
-      set_full(SpaceTimeGrid::makeFourDimGrid(
-          Params.lattice_v, GridDefaultSimd(4, vector_type::Nsimd()),
-          Params.mpi_v));
-      set_rb(SpaceTimeGrid::makeFourDimRedBlackGrid(grid_.get()));
-    } else {
-      std::cout
-          << "Error in GridFourDimModule: lattice dimension different from 4"
-          << std::endl;
-      exit(1);
-    }
-  }
-};
-
-
 ////////////////////////////////////////////////////////////////////
 class RNGModuleParameters: Serializable {
 

lib/qcd/hmc/HMCResourceManager.h

@@ -88,7 +88,7 @@ class HMCResourceManager {
     AddGrid("gauge", GridMod);
 
     // Checkpointer
-    auto &CPfactory = HMC_CPModuleFactory<cp_string, QCD::PeriodicGimplR, ReaderClass >::getInstance();
+    auto &CPfactory = HMC_CPModuleFactory<cp_string, ImplementationPolicy, ReaderClass >::getInstance();
     Read.push("Checkpointer");
     std::string cp_type;
     read(Read,"name", cp_type);

lib/qcd/hmc/HMC_GridModules.h

@@ -0,0 +1,120 @@
+/*************************************************************************************
+
+Grid physics library, www.github.com/paboyle/Grid
+
+Source file: ./lib/qcd/hmc/HMC_GridModules.h
+
+Copyright (C) 2015
+Copyright (C) 2016
+
+Author: Guido Cossu <guido.cossu@ed.ac.uk>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+See the full license in the file "LICENSE" in the top level distribution
+directory
+*************************************************************************************/
+/*  END LEGAL */
+#ifndef HMC_GRID_MODULES
+#define HMC_GRID_MODULES
+
+namespace Grid {
+namespace QCD {
+
+// Resources
+// Modules for grids 
+
+class GridModuleParameters: Serializable{
+  
+  GRID_SERIALIZABLE_CLASS_MEMBERS(GridModuleParameters,
+  std::string, lattice,
+  std::string,  mpi);
+
+public: 
+  // these namings are ugly
+  // also ugly the distinction between the serializable members
+  // and this
+  std::vector<int> lattice_v;
+  std::vector<int> mpi_v;
+
+  GridModuleParameters(const std::vector<int> l_ = std::vector<int>(),
+    const std::vector<int> mpi_ = std::vector<int>()):lattice_v(l_), mpi_v(mpi_){}
+
+  template <class ReaderClass>
+  GridModuleParameters(Reader<ReaderClass>& Reader) {
+    read(Reader, "LatticeGrid", *this);
+    lattice_v = strToVec<int>(lattice);
+    mpi_v = strToVec<int>(mpi);
+    if (mpi_v.size() != lattice_v.size()) {
+      std::cout << "Error in GridModuleParameters: lattice and mpi dimensions "
+                   "do not match"
+                << std::endl;
+      exit(1);
+    }
+  }
+};
+
+class GridModule {
+ public:
+  GridCartesian* get_full() { 
+    std::cout << GridLogDebug << "Getting cartesian in module"<< std::endl;
+    return grid_.get(); }
+  GridRedBlackCartesian* get_rb() { 
+    std::cout << GridLogDebug << "Getting rb-cartesian in module"<< std::endl;
+    return rbgrid_.get(); }
+
+  void set_full(GridCartesian* grid) { grid_.reset(grid); }
+  void set_rb(GridRedBlackCartesian* rbgrid) { rbgrid_.reset(rbgrid); }
+
+ protected:
+  std::unique_ptr<GridCartesian> grid_;
+  std::unique_ptr<GridRedBlackCartesian> rbgrid_;
+  
+};
+
+// helpers
+class GridFourDimModule : public GridModule {
+ public:
+  // add a function to create the module from a Reader
+  GridFourDimModule() {
+    set_full(SpaceTimeGrid::makeFourDimGrid(
+        GridDefaultLatt(), GridDefaultSimd(4, vComplex::Nsimd()),
+        GridDefaultMpi()));
+    set_rb(SpaceTimeGrid::makeFourDimRedBlackGrid(grid_.get()));
+  }
+
+  template <class vector_type = vComplex>
+  GridFourDimModule(GridModuleParameters Params) {
+    if (Params.lattice_v.size() == 4) {
+      set_full(SpaceTimeGrid::makeFourDimGrid(
+          Params.lattice_v, GridDefaultSimd(4, vector_type::Nsimd()),
+          Params.mpi_v));
+      set_rb(SpaceTimeGrid::makeFourDimRedBlackGrid(grid_.get()));
+    } else {
+      std::cout
+          << "Error in GridFourDimModule: lattice dimension different from 4"
+          << std::endl;
+      exit(1);
+    }
+  }
+};
+
+
+
+
+}  // namespace QCD
+}  // namespace Grid
+
+#endif  // HMC_GRID_MODULES