Reorganizing files

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 {