Fixed seg fault for observable modules

lib/json/json.hpp

@@ -64,7 +64,7 @@ SOFTWARE.
     #endif
 #elif defined(__GNUC__)
     #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-    #if GCC_VERSION < 40900
+    #if GCC_VERSION < 40800
         #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
     #endif
 #endif

lib/qcd/hmc/HMCResourceManager.h

@@ -68,6 +68,7 @@ class HMCResourceManager {
   // A vector of HmcObservable modules
   std::vector<std::unique_ptr<ObservableBaseModule> > ObservablesList;
 
+
   // A vector of HmcObservable modules
   std::multimap<int, std::unique_ptr<ActionBaseModule> > ActionsList;
   std::vector<int> multipliers;
@@ -249,9 +250,9 @@ class HMCResourceManager {
   // Observables
   ////////////////////////////////////////////////////////
 
-  void AddObservable(ObservableBaseModule *O){
-    // acquire resource
-    ObservablesList.push_back(std::unique_ptr<ObservableBaseModule>(std::move(O)));
+  template<class T, class... Types>
+  void AddObservable(Types&&... Args){
+    ObservablesList.push_back(std::unique_ptr<T>(new T(std::forward<Types>(Args)...)));
   }
 
   std::vector<HmcObservable<typename ImplementationPolicy::Field>* > GetObservables(){

lib/qcd/modules/ObservableModules.h

@@ -41,13 +41,14 @@ class ObservableModule
  public:
   typedef HMCModuleBase< QCD::HmcObservable< typename ObservableType::Field> > Base;
   typedef typename Base::Product Product;
+  typedef OPar Parameters;
 
   std::unique_ptr<ObservableType> ObservablePtr;
 
   ObservableModule(OPar Par) : Parametrized<OPar>(Par) {}
 
   virtual void print_parameters(){
-    std::cout << this->Par_ << std::endl;
+    Parametrized<OPar>::print_parameters();
   }
 
   template <class ReaderClass>
@@ -79,14 +80,18 @@ class PlaquetteObsParameters : Serializable {
 };
 
 template < class Impl >
-class PlaquetteMod: public ObservableModule<PlaquetteLogger<Impl>, PlaquetteObsParameters>{
-  typedef ObservableModule<PlaquetteLogger<Impl>, PlaquetteObsParameters> ObsBase;
+class PlaquetteMod: public ObservableModule<PlaquetteLogger<Impl>, NoParameters>{
+  typedef ObservableModule<PlaquetteLogger<Impl>, NoParameters> ObsBase;
   using ObsBase::ObsBase; // for constructors
 
+
+
   // acquire resource
   virtual void initialize(){
-    this->ObservablePtr.reset(new PlaquetteLogger<Impl>(this->Par_.output_prefix));
+    this->ObservablePtr.reset(new PlaquetteLogger<Impl>());
   }
+  public:
+  PlaquetteMod(): ObsBase(NoParameters()){}
 };
 
 

lib/qcd/observables/plaquette.h

@@ -2,7 +2,7 @@
 
 Grid physics library, www.github.com/paboyle/Grid
 
-Source file: ./lib/qcd/modules/Registration.h
+Source file: ./lib/qcd/modules/plaquette.h
 
 Copyright (C) 2017
 
@@ -43,41 +43,25 @@ class PlaquetteLogger : public HmcObservable<typename Impl::Field> {
   // here forces the Impl to be of gauge fields
   // if not the compiler will complain
   INHERIT_GIMPL_TYPES(Impl);
-  typedef typename Impl::Field Field;  // necessary for HmcObservable compatibility
-  explicit PlaquetteLogger(std::string cf) { Stem = cf; }
+
+  // necessary for HmcObservable compatibility
+  typedef typename Impl::Field Field;
 
   void TrajectoryComplete(int traj,
                           Field &U,
                           GridSerialRNG &sRNG,
                           GridParallelRNG &pRNG) {
-    std::string file;
-    {
-      std::ostringstream os;
-      os << Stem << "." << traj;
-      file = os.str();
-    }
-    std::ofstream of(file);
 
-    RealD peri_plaq = WilsonLoops<PeriodicGimplR>::avgPlaquette(U);
-    RealD peri_rect = WilsonLoops<PeriodicGimplR>::avgRectangle(U);
+    RealD plaq = WilsonLoops<Impl>::avgPlaquette(U);
 
-    RealD impl_plaq = WilsonLoops<Impl>::avgPlaquette(U);
-    RealD impl_rect = WilsonLoops<Impl>::avgRectangle(U);
+    int def_prec = std::cout.precision();
+
+    std::cout << GridLogMessage
+        << std::setprecision(std::numeric_limits<Real>::digits10 + 1)
+        << "Plaquette: [ " << traj << " ] "<< plaq << std::endl;
+
+    std::cout.precision(def_prec);
 
-    // Fixme reorganise this output
-    of << traj << " " << impl_plaq << " " << impl_rect << "  " << peri_plaq
-       << " " << peri_rect << std::endl;
-    std::cout << GridLogMessage << "traj"
-              << " "
-              << "plaq "
-              << " "
-              << " rect  "
-              << "  "
-              << "peri_plaq"
-              << " "
-              << "peri_rect" << std::endl;
-    std::cout << GridLogMessage << traj << " " << impl_plaq << " " << impl_rect
-              << "  " << peri_plaq << " " << peri_rect << std::endl;
   }
 };
 

lib/qcd/observables/topological_charge.h

@@ -0,0 +1,49 @@
+/*************************************************************************************
+
+Grid physics library, www.github.com/paboyle/Grid
+
+Source file: ./lib/qcd/modules/topological_charge.h
+
+Copyright (C) 2017
+
+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_TOP_CHARGE_H
+#define HMC_TOP_CHARGE_H
+
+namespace Grid {
+namespace QCD (
+
+// this is only defined for a gauge theory
+template <class Impl>
+class TopologicalCharge : public HmcObservable<typename Impl::Field> {
+ private:
+  std::string Stem;
+
+ public:
+
+};
+
+)
+}
+
+#endif  //  HMC_TOP_CHARGE_H