diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index d8b0d0da..980a4cf5 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -171,6 +171,7 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; + env_.setTrajectory(t); execute(program_); env_.freeAll(); } diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index c72e1fca..9f572f17 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -55,6 +55,17 @@ bool Environment::isDryRun(void) const return dryRun_; } +// trajectory number /////////////////////////////////////////////////////////// +void Environment::setTrajectory(const unsigned int traj) +{ + traj_ = traj; +} + +unsigned int Environment::getTrajectory(void) const +{ + return traj_; +} + // grids /////////////////////////////////////////////////////////////////////// GridCartesian * Environment::getGrid(const unsigned int Ls) const { diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 91f0ec23..5a4c1e3f 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -52,6 +52,9 @@ public: // dry run void dryRun(const bool isDry); bool isDryRun(void) const; + // trajectory number + void setTrajectory(const unsigned int traj); + unsigned int getTrajectory(void) const; // grids GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; @@ -86,6 +89,7 @@ public: void freeAll(void); private: bool dryRun_{false}; + unsigned int traj_; GridPt grid4d_; std::map grid5d_; GridRbPt gridRb4d_; diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc new file mode 100644 index 00000000..2add8a11 --- /dev/null +++ b/programs/Hadrons/GLoad.cc @@ -0,0 +1,77 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GLoad.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +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. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* GLoad implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +GLoad::GLoad(const std::string name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void GLoad::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector GLoad::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector GLoad::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void GLoad::allocate(Environment &env) +{ + env.createGauge(getName()); + gauge_ = env.getGauge(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void GLoad::execute(Environment &env) +{ + NerscField header; + std::string fileName = par_.file + "." + + std::to_string(env.getTrajectory()); + + NerscIO::readConfiguration(*gauge_, header, fileName); +} diff --git a/programs/Hadrons/GLoad.hpp b/programs/Hadrons/GLoad.hpp new file mode 100644 index 00000000..a40ed2c2 --- /dev/null +++ b/programs/Hadrons/GLoad.hpp @@ -0,0 +1,71 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GLoad.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +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. +*******************************************************************************/ + +#ifndef Hadrons_GLoad_hpp_ +#define Hadrons_GLoad_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Load a NERSC configuration * + ******************************************************************************/ +class GLoad: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, file); + }; +public: + // constructor + GLoad(const std::string name); + // destructor + virtual ~GLoad(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + Par par_; + LatticeGaugeField *gauge_ = nullptr; +}; + +MODULE_REGISTER(GLoad); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_GLoad_hpp_ diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc new file mode 100644 index 00000000..d39769a9 --- /dev/null +++ b/programs/Hadrons/GRandom.cc @@ -0,0 +1,65 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GRandom.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +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. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* GRandom implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +GRandom::GRandom(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector GRandom::getInput(void) +{ + return std::vector(); +} + +std::vector GRandom::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void GRandom::allocate(Environment &env) +{ + env.createGauge(getName()); + gauge_ = env.getGauge(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void GRandom::execute(Environment &env) +{ + SU3::HotConfiguration(*env.get4dRng(), *gauge_); +} diff --git a/programs/Hadrons/GRandom.hpp b/programs/Hadrons/GRandom.hpp new file mode 100644 index 00000000..18660bf9 --- /dev/null +++ b/programs/Hadrons/GRandom.hpp @@ -0,0 +1,62 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GRandom.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +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. +*******************************************************************************/ + +#ifndef Hadrons_GRandom_hpp_ +#define Hadrons_GRandom_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Random gauge * + ******************************************************************************/ +class GRandom: public Module +{ +public: + // constructor + GRandom(const std::string name); + // destructor + virtual ~GRandom(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + LatticeGaugeField *gauge_ = nullptr; +}; + +MODULE_REGISTER(GRandom); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_GRandom_hpp_ diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 499122ac..72f04612 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -26,6 +26,8 @@ Hadrons_SOURCES += \ # gauge modules Hadrons_SOURCES += \ + GLoad.cc \ + GRandom.cc \ GUnit.cc # solver modules