X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/f59cde38c42ac1d468b6a4aedaab0f3a94f9497a..5631e78e06df267533ac5e8d97c3053d72a31eb4:/sim-nor.hpp?ds=sidebyside diff --git a/sim-nor.hpp b/sim-nor.hpp index 7bb4a7c..a15547b 100644 --- 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& phix); double rhoPhi(const int& x, const complex& phixCandidate); }; @@ -50,14 +45,18 @@ 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; itcomargs.lsize[0]; it++) + for (int iy=(it+ichecker)%2; iycomargs.lsize[1]; iy+=2) + updatePhi( it*O815->comargs.lsize[1] + iy ); } void sim::_newParas() { M = pow( (*O815->paraQ)["mass"], 2 ) + 4; *log << "SIM: Resetting fields." << endl << flush; - memset(conf, 0, sizeof(siteconf)*LSIZE2); + + for (int ix=0; ix