Hadrons: most modules ported to the new interface, compiles but untested

extras/Hadrons/Modules/MGauge/Load.cc

@@ -49,6 +49,13 @@ std::vector<std::string> TLoad::getInput(void)
     return in;
 }
 
+std::vector<std::string> TLoad::getReference(void)
+{
+    std::vector<std::string> ref;
+    
+    return ref;
+}
+
 std::vector<std::string> TLoad::getOutput(void)
 {
     std::vector<std::string> out = {getName()};
@@ -59,19 +66,19 @@ std::vector<std::string> TLoad::getOutput(void)
 // setup ///////////////////////////////////////////////////////////////////////
 void TLoad::setup(void)
 {
-    env().registerLattice<LatticeGaugeField>(getName());
+    envCreateLat(LatticeGaugeField, getName());
 }
 
 // execution ///////////////////////////////////////////////////////////////////
 void TLoad::execute(void)
 {
-    FieldMetaData  header;
-    std::string fileName = par().file + "."
-                           + std::to_string(env().getTrajectory());
-    
+    FieldMetaData header;
+    std::string   fileName = par().file + "."
+                             + std::to_string(vm().getTrajectory());
     LOG(Message) << "Loading NERSC configuration from file '" << fileName
                  << "'" << std::endl;
-    LatticeGaugeField &U = *env().createLattice<LatticeGaugeField>(getName());
+
+    auto &U = envGet(LatticeGaugeField, getName());
     NerscIO::readConfiguration(U, header, fileName);
     LOG(Message) << "NERSC header:" << std::endl;
     dump_meta_data(header, LOG(Message));

extras/Hadrons/Modules/MGauge/Load.hpp

@@ -57,6 +57,7 @@ public:
     virtual ~TLoad(void) = default;
     // dependency relation
     virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getReference(void);
     virtual std::vector<std::string> getOutput(void);
 protected:
     // setup

extras/Hadrons/Modules/MGauge/Random.cc

@@ -44,7 +44,16 @@ TRandom::TRandom(const std::string name)
 // dependencies/products ///////////////////////////////////////////////////////
 std::vector<std::string> TRandom::getInput(void)
 {
-    return std::vector<std::string>();
+    std::vector<std::string> in;
+    
+    return in;
+}
+
+std::vector<std::string> TRandom::getReference(void)
+{
+    std::vector<std::string> ref;
+    
+    return ref;
 }
 
 std::vector<std::string> TRandom::getOutput(void)
@@ -57,13 +66,14 @@ std::vector<std::string> TRandom::getOutput(void)
 // setup ///////////////////////////////////////////////////////////////////////
 void TRandom::setup(void)
 {
-    env().registerLattice<LatticeGaugeField>(getName());
+    envCreateLat(LatticeGaugeField, getName());
 }
 
 // execution ///////////////////////////////////////////////////////////////////
 void TRandom::execute(void)
 {
     LOG(Message) << "Generating random gauge configuration" << std::endl;
-    LatticeGaugeField &U = *env().createLattice<LatticeGaugeField>(getName());
+    
+    auto &U = envGet(LatticeGaugeField, getName());
     SU3::HotConfiguration(*env().get4dRng(), U);
 }

extras/Hadrons/Modules/MGauge/Random.hpp

@@ -50,6 +50,7 @@ public:
     virtual ~TRandom(void) = default;
     // dependency relation
     virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getReference(void);
     virtual std::vector<std::string> getOutput(void);
 protected:
     // setup

extras/Hadrons/Modules/MGauge/StochEm.cc

@@ -47,6 +47,13 @@ std::vector<std::string> TStochEm::getInput(void)
     return in;
 }
 
+std::vector<std::string> TStochEm::getReference(void)
+{
+    std::vector<std::string> ref = {};
+    
+    return ref;
+}
+
 std::vector<std::string> TStochEm::getOutput(void)
 {
     std::vector<std::string> out = {getName()};
@@ -57,32 +64,28 @@ std::vector<std::string> TStochEm::getOutput(void)
 // setup ///////////////////////////////////////////////////////////////////////
 void TStochEm::setup(void)
 {
-    if (!env().hasRegisteredObject("_" + getName() + "_weight"))
+    if (!env().hasCreatedObject("_" + getName() + "_weight"))
     {
-        env().registerLattice<EmComp>("_" + getName() + "_weight");
+        envCacheLat(EmComp, "_" + getName() + "_weight");
     }
-    env().registerLattice<EmField>(getName());
+    envCreateLat(EmField, getName());
 }
 
 // execution ///////////////////////////////////////////////////////////////////
 void TStochEm::execute(void)
 {
+    LOG(Message) << "Generating stochatic EM potential..." << std::endl;
+
     PhotonR photon(par().gauge, par().zmScheme);
-    EmField &a = *env().createLattice<EmField>(getName());
-    EmComp  *w;
+    auto    &a = envGet(EmField, getName());
+    auto    &w = envGet(EmComp, "_" + getName() + "_weight");
     
     if (!env().hasCreatedObject("_" + getName() + "_weight"))
     {
         LOG(Message) << "Caching stochatic EM potential weight (gauge: "
                      << par().gauge << ", zero-mode scheme: "
                      << par().zmScheme << ")..." << std::endl;
-        w = env().createLattice<EmComp>("_" + getName() + "_weight");
-        photon.StochasticWeight(*w);
+        photon.StochasticWeight(w);
     }
-    else
-    {
-        w = env().getObject<EmComp>("_" + getName() + "_weight");
-    }
-    LOG(Message) << "Generating stochatic EM potential..." << std::endl;
-    photon.StochasticField(a, *env().get4dRng(), *w);
+    photon.StochasticField(a, *env().get4dRng(), w);
 }

extras/Hadrons/Modules/MGauge/StochEm.hpp

@@ -59,6 +59,7 @@ public:
     virtual ~TStochEm(void) = default;
     // dependency relation
     virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getReference(void);
     virtual std::vector<std::string> getOutput(void);
 protected:
     // setup

extras/Hadrons/Modules/MGauge/Unit.cc

@@ -71,6 +71,7 @@ void TUnit::setup(void)
 void TUnit::execute(void)
 {
     LOG(Message) << "Creating unit gauge configuration" << std::endl;
+    
     auto &U = envGet(LatticeGaugeField, getName());
     SU3::ColdConfiguration(*env().get4dRng(), U);
 }