From bac36399c1d55413c42e68ad83ce894aa7f3c1b4 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Fri, 7 May 2021 00:36:28 +0200
Subject: [PATCH] Compiles

---
 Grid/qcd/action/fermion/WilsonFermion.h       |  6 +++---
 .../WilsonFermionImplementation.h             |  8 ++++----
 Grid/qcd/hmc/HMC.h                            | 19 ++++++-------------
 Grid/qcd/hmc/integrators/Integrator.h         |  6 +++---
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Grid/qcd/action/fermion/WilsonFermion.h b/Grid/qcd/action/fermion/WilsonFermion.h
index e23d7092..dadfc360 100644
--- a/Grid/qcd/action/fermion/WilsonFermion.h
+++ b/Grid/qcd/action/fermion/WilsonFermion.h
@@ -146,11 +146,11 @@ public:
   void DhopInternalSerial(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U,
                     const FermionField &in, FermionField &out, int dag);
 
-  void DhopInternalDirichlet(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U,
-			     const FermionField &in, FermionField &out, int dag);
+  void DhopInternalDirichletComms(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U,
+				  const FermionField &in, FermionField &out, int dag);
   
   void DhopInternalOverlappedComms(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U,
-                    const FermionField &in, FermionField &out, int dag);
+				   const FermionField &in, FermionField &out, int dag);
 
   // Constructor
   WilsonFermion(GaugeField &_Umu, GridCartesian &Fgrid,
diff --git a/Grid/qcd/action/fermion/implementation/WilsonFermionImplementation.h b/Grid/qcd/action/fermion/implementation/WilsonFermionImplementation.h
index a9460dd6..a88da710 100644
--- a/Grid/qcd/action/fermion/implementation/WilsonFermionImplementation.h
+++ b/Grid/qcd/action/fermion/implementation/WilsonFermionImplementation.h
@@ -572,10 +572,10 @@ void WilsonFermion<Impl>::DhopInternalOverlappedComms(StencilImpl &st, LebesgueO
 };
 
 template <class Impl>
-void WilsonFermion<Impl>::DhopDirichletComms(StencilImpl &st, LebesgueOrder &lo,
-					     DoubledGaugeField &U,
-					     const FermionField &in,
-					     FermionField &out, int dag)
+void WilsonFermion<Impl>::DhopInternalDirichletComms(StencilImpl &st, LebesgueOrder &lo,
+						     DoubledGaugeField &U,
+						     const FermionField &in,
+						     FermionField &out, int dag)
 {
   assert((dag == DaggerNo) || (dag == DaggerYes));
 
diff --git a/Grid/qcd/hmc/HMC.h b/Grid/qcd/hmc/HMC.h
index 7e7ee1aa..9d07715b 100644
--- a/Grid/qcd/hmc/HMC.h
+++ b/Grid/qcd/hmc/HMC.h
@@ -205,14 +205,11 @@ private:
     ///////////////////////////////////////////////////////////
 
     std::cout.precision(15);
-<<<<<<< HEAD
-    std::cout << GridLogHMC << "Total H after trajectory  = " << H1
-	      << "  dH = " << H1 - H0 << "\n";
-=======
-    std::cout << GridLogMessage << "--------------------------------------------------\n";
-    std::cout << GridLogMessage << "Total H after trajectory  = " << H1 << "  dH = " << H1 - H0 << "\n";
-    std::cout << GridLogMessage << "--------------------------------------------------\n";
->>>>>>> bd181b94819600174e91b331e24f71598b3e7bb9
+
+    std::cout << GridLogHMC << "--------------------------------------------------\n";
+    std::cout << GridLogHMC << "Total H after trajectory  = " << H1 << "  dH = " << H1 - H0 << "\n";
+    std::cout << GridLogHMC << "--------------------------------------------------\n";
+
     std::cout.precision(current_precision);
     
     return (H1 - H0);
@@ -240,13 +237,9 @@ public:
     unsigned int FinalTrajectory = Params.Trajectories + Params.NoMetropolisUntil + Params.StartTrajectory;
 
     for (int traj = Params.StartTrajectory; traj < FinalTrajectory; ++traj) {
-<<<<<<< HEAD
+
       std::cout << GridLogHMC << "-- # Trajectory = " << traj << "\n";
-=======
 
-      std::cout << GridLogMessage << "-- # Trajectory = " << traj << "\n";
-
->>>>>>> bd181b94819600174e91b331e24f71598b3e7bb9
       if (traj < Params.StartTrajectory + Params.NoMetropolisUntil) {
       	std::cout << GridLogHMC << "-- Thermalization" << std::endl;
       }
diff --git a/Grid/qcd/hmc/integrators/Integrator.h b/Grid/qcd/hmc/integrators/Integrator.h
index ac2f5e05..229f7393 100644
--- a/Grid/qcd/hmc/integrators/Integrator.h
+++ b/Grid/qcd/hmc/integrators/Integrator.h
@@ -141,12 +141,12 @@ protected:
       Real impulse_abs = force_abs * ep * HMC_MOMENTUM_DENOMINATOR;    
 
       Real force_max   = std::sqrt(maxLocalNorm2(force));
-      Real impulse_max = max_force_abs * ep * HMC_MOMENTUM_DENOMINATOR;    
+      Real impulse_max = force_max * ep * HMC_MOMENTUM_DENOMINATOR;    
 
       std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Force average: " << force_abs <<" "<<name<<std::endl;
       std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Force max    : " << force_max <<" "<<name<<std::endl;
-      std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Fdt average  : " << force_abs*ep <<" "<<name<<std::endl;
-      std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Fdt max      : " << force_max*ep <<" "<<name<<std::endl;
+      std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Fdt average  : " << impulse_abs <<" "<<name<<std::endl;
+      std::cout << GridLogIntegrator<< "["<<level<<"]["<<a<<"] Fdt max      : " << impulse_max <<" "<<name<<std::endl;
 
       Mom -= force * ep* HMC_MOMENTUM_DENOMINATOR;; 
       double end_full = usecond();