Implemented 1mr algorithm.

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

diff --git a/sim-nor.hpp b/sim-nor.hpp
index 7bb4a7c8fa8adb868c5c9755096ca5f48c07f158..2f5d22c50611f62c18463213220394b2f878608e 100644 (file)
--- a/sim-nor.hpp
+++ b/sim-nor.hpp
@@ -21,15 +21,10 @@ public:
 private:
   void _makeSweep();
   void _newParas();
-
   gsl_rng* rangsl;
-
   neigh *nb;
-
   int updatePhi (const int& x);
-
   double M;
-
   double SofPhi(const int& x, const complex<double>& phix);
   double rhoPhi(const int& x, const complex<double>& phixCandidate);
 };
@@ -50,8 +45,10 @@ sim::sim(o815 *_O815) : o815::sim( _O815,
 }
 
 void sim::_makeSweep() {  
-  for (int ix = 0; ix < LSIZE2; ix++)
-    updatePhi(ix);
+  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() {