From 422dbc80cd2474d7ae75d89eb1dde41a5b6ca804 Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Fri, 19 Jan 2018 08:33:11 +0000
Subject: [PATCH] Correcting sign for shGordon action

---
 lib/qcd/action/scalar/ScalarImpl.h     | 2 ++
 lib/qcd/action/scalar/shGordonAction.h | 4 ++--
 lib/qcd/hmc/integrators/Integrator.h   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/qcd/action/scalar/ScalarImpl.h b/lib/qcd/action/scalar/ScalarImpl.h
index 55f5049d..f072960b 100644
--- a/lib/qcd/action/scalar/ScalarImpl.h
+++ b/lib/qcd/action/scalar/ScalarImpl.h
@@ -29,7 +29,9 @@ class ScalarImplTypes {
     static inline Field projectForce(Field& P){return P;}
 
     static inline void update_field(Field& P, Field& U, double ep) {
+      std::cout << GridLogDebug << "P:\n" << P << std::endl;
       U += P*ep;
+      std::cout << GridLogDebug << "U:\n" << U << std::endl;
     }
 
     static inline RealD FieldSquareNorm(Field& U) {
diff --git a/lib/qcd/action/scalar/shGordonAction.h b/lib/qcd/action/scalar/shGordonAction.h
index 961230fe..64c94dd5 100644
--- a/lib/qcd/action/scalar/shGordonAction.h
+++ b/lib/qcd/action/scalar/shGordonAction.h
@@ -55,7 +55,7 @@ class shGordonAction : public QCD::Action<typename Impl::Field> {
     virtual void refresh(const Field &U, GridParallelRNG &pRNG) {}  // noop as no pseudoferms
 
     virtual RealD S(const Field &phi) {
-      return QCD::Nd * ScalarObs<Impl>::sumphisquared(phi) + ScalarObs<Impl>::sumphider(phi) - 0.5*mass_square/(g*g)*sum(trace(exp(g*phi) + exp(-g*phi)))   ;
+      return QCD::Nd * ScalarObs<Impl>::sumphisquared(phi) + ScalarObs<Impl>::sumphider(phi) + 0.5*mass_square/(g*g)*sum(trace(exp(g*phi) + exp(-g*phi)))   ;
     };
 
     virtual void deriv(const Field &phi,
@@ -65,7 +65,7 @@ class shGordonAction : public QCD::Action<typename Impl::Field> {
         for (int mu = 0; mu < QCD::Nd; mu++) tmp -= Cshift(phi, mu, 1) + Cshift(phi, mu, -1);
 
         std::cout << GridLogDebug << "Phi norm : " << norm2(phi) << std::endl;
-        force+= tmp - 0.5*mass_square/g*(exp(g*phi) - exp(-g*phi));
+        force+= tmp + 0.5*mass_square/g*(exp(g*phi) - exp(-g*phi));
     }
 };
 
diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h
index 95b19904..9b99963d 100644
--- a/lib/qcd/hmc/integrators/Integrator.h
+++ b/lib/qcd/hmc/integrators/Integrator.h
@@ -103,7 +103,7 @@ class Integrator {
         // Implement smearing only for the fundamental representation now
         repr_set.at(a)->deriv(Rep.U, forceR);
         GF force = Rep.RtoFundamentalProject(forceR);  // Ta for the fundamental rep
-        Real force_abs = std::sqrt(norm2(force)/(U._grid->gSites()));
+        Real force_abs = std::sqrt(norm2(force))/(U._grid->gSites());
         std::cout << GridLogIntegrator << "Hirep Force average: " << force_abs << std::endl;
         Mom -= force * ep ;
       }
@@ -123,7 +123,7 @@ class Integrator {
       std::cout << GridLogIntegrator << "Smearing (on/off): " << as[level].actions.at(a)->is_smeared << std::endl;
       if (as[level].actions.at(a)->is_smeared) Smearer.smeared_force(force);
       force = FieldImplementation::projectForce(force); // Ta for gauge fields
-      Real force_abs = std::sqrt(norm2(force)/U._grid->gSites());
+      Real force_abs = std::sqrt(norm2(force))/U._grid->gSites();
       std::cout << GridLogIntegrator << "Force average: " << force_abs << std::endl;
       Mom -= force * ep; 
     }