Checkerboard sweep for nor algorithm.

[phys/heatbath.git] / sim-r.hpp

diff --git a/sim-r.hpp b/sim-r.hpp
index aa305ff71abcaaec1e0e1a7f976e671ffe13d74d..ae6adc4c3ce03ee2787d857fa2fb481df9c58ad1 100644 (file)
--- a/sim-r.hpp
+++ b/sim-r.hpp
@@ -19,12 +19,10 @@ public:
 private:
   void _makeSweep();
   void _newParas();
-
   gsl_rng* rangsl;
-
   neigh *nb;
-
   void updatePhi (const int& x);
+  double M;
 };
 
 
@@ -46,13 +44,27 @@ 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;
+
+  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;
+  memset(conf, 0, sizeof(siteconf)*LSIZE2);
 }
 
 #endif