X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/7a2a209a8e67d342eb4faa2fa203a94fb68d5e6c..a70bf950d14902f91ae0c0e4027537a7e23d3bc5:/sim-1mr.hpp

diff --git a/sim-1mr.hpp b/sim-1mr.hpp
index aa305ff..d03ef22 100644
--- a/sim-1mr.hpp
+++ b/sim-1mr.hpp
@@ -15,15 +15,14 @@ public:
   sim(o815 *_O815);
   siteconf* conf;
   unsigned int LSIZE2;
+  double M;
+  double m;
+  neigh *nb;
 
 private:
   void _makeSweep();
   void _newParas();
-
   gsl_rng* rangsl;
-
-  neigh *nb;
-
   void updatePhi (const int& x);
 };
 
@@ -44,15 +43,35 @@ 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)
+    * polar(1.0, 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 = (*O815->paraQ)["mass"];
+  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