From 50a3598744cc635ceada9ab6adc376f1e3fa10a5 Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <alex@treefish.org>
Date: Fri, 15 Nov 2013 20:04:12 +0100
Subject: [PATCH] Implemented 1mr algorithm.

---
 sim-1mr.hpp | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/sim-1mr.hpp b/sim-1mr.hpp
index aa305ff..5565700 100644
--- a/sim-1mr.hpp
+++ b/sim-1mr.hpp
@@ -19,12 +19,10 @@ public:
 private:
   void _makeSweep();
   void _newParas();
-
   gsl_rng* rangsl;
-
   neigh *nb;
-
   void updatePhi (const int& x);
+  double M;
 };
 
 
@@ -44,15 +42,34 @@ sim::sim(o815 *_O815) : o815::sim( _O815,
 
 void sim::updatePhi (const int& x) 
 {
-  const double r = gsl_rng_uniform(rangsl);
   const double theta = gsl_rng_uniform(rangsl) * 2*M_PI;
+  complex<double> V=0;
+
+  for (int nu=0; nu<4; nu++)
+    V += conf[ (*nb)[x*4+nu] ].phi;
+
+  const double r = exp( - M * norm(conf[x].phi)
+			- 1./M * norm(V)
+			+ 2 * real( conf[x].phi * conj(V) ) );
+
+  conf[x].phi = sqrt(std::log( 1./(1-r) )) / sqrt(M)
+    * complex<double>( cos(theta), sin(theta) )
+    + V / M;
 }
 
 void sim::_makeSweep() {  
+  for (int ichecker=0; ichecker<2; ichecker++)
+    for (int it=0; it<O815->comargs.lsize[0]; it++)
+      for (int iy=(it+ichecker)%2; iy<O815->comargs.lsize[1]; iy+=2)
+	updatePhi( it*O815->comargs.lsize[1] + iy );
 }
 
 void sim::_newParas() {
-  /* reset variables */
+  M = pow( (*O815->paraQ)["mass"], 2 ) + 4;
+  *log << "SIM: Resetting fields." << endl << flush;
+
+  for (int ix=0; ix<LSIZE2; ix++)
+    conf[ix].phi = 1;
 }
 
 #endif
-- 
2.39.5