Added 1mr+ algorithm.

diff --git a/.gitignore b/.gitignore
index 356965eb01ab7b0417ce7c809098f77c95ce0a7b..f6507bdc2b8028b8edb6ca0de030e79baeb0e2e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ data
 heatbath-nor
 heatbath-1mr
 heatbath-r
+heatbath-1mr+

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1840155ff5dc9d0170dda831b232d6d07bd3fc65..41c8e074f076cfadb6a35c06ba36212620e72ec8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,3 +22,7 @@ target_link_libraries(heatbath-r o815 gsl gslcblas lat_neigh)
 add_executable(heatbath-1mr heatbath.cpp)
 set_target_properties(heatbath-1mr PROPERTIES COMPILE_DEFINITIONS "ALGORITHM_1MR")
 target_link_libraries(heatbath-1mr o815 gsl gslcblas lat_neigh)
+
+add_executable(heatbath-1mr+ heatbath.cpp)
+set_target_properties(heatbath-1mr+ PROPERTIES COMPILE_DEFINITIONS "ALGORITHM_1MRPLUS")
+target_link_libraries(heatbath-1mr+ o815 gsl gslcblas lat_neigh)

diff --git a/heatbath.cpp b/heatbath.cpp
index ffa1f6e262275fc8fb85d595d7b02481627c027f..a6f08595d7c0a5a4c22ed655ed19c699166c9f2f 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -11,6 +11,9 @@
 #elif ALGORITHM_1MR
 #define ALGORITHM "1mr"
 #include "sim-1mr.hpp"
+#elif ALGORITHM_1MRPLUS
+#define ALGORITHM "1mr+"
+#include "sim-1mr+.hpp"
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif

diff --git a/sim-1mr+.hpp b/sim-1mr+.hpp
new file mode 100644 (file)
index 0000000..8902558
--- /dev/null
+++ b/sim-1mr+.hpp
@@ -0,0 +1,82 @@
+#ifndef SIM_HPP
+#define SIM_HPP
+
+#include <gsl/gsl_rng.h>
+#include <complex>
+#include <math.h>
+
+#include "latlib/neigh.h"
+
+class sim : public o815::sim {
+public:
+  struct siteconf {
+    complex<double> phi;
+  };
+  sim(o815 *_O815);
+  siteconf* conf;
+  unsigned int LSIZE2;
+  double M;
+  double m;
+  neigh *nb;
+
+private:
+  void _makeSweep();
+  void _newParas();
+  gsl_rng* rangsl;
+  void updatePhi (const int& x);
+};
+
+
+
+sim::sim(o815 *_O815) : o815::sim( _O815, 
+                                  sizeof(siteconf)*
+                                  (_O815->comargs.lsize[0]*_O815->comargs.lsize[1]) ) {
+  conf = (siteconf*)confMem;
+
+  rangsl = gsl_rng_alloc(gsl_rng_ranlxs0);
+  gsl_rng_set(rangsl, time(NULL));
+
+  LSIZE2 = _O815->comargs.lsize[0] * _O815->comargs.lsize[1];
+
+  nb = new neigh(2, _O815->comargs.lsize[0], _O815->comargs.lsize[1]);
+}
+
+void sim::updatePhi (const int& x) 
+{
+  complex<double> V=0;
+  const double theta = gsl_rng_uniform(rangsl) * 2*M_PI;
+
+  for (int nu=0; nu<4; nu++)
+    V += conf[ (*nb)[x*4+nu] ].phi;
+
+  const double V2diff = pow(real(V), 2) - pow(imag(V), 2);
+  const double Vprod = real(V)*imag(V);
+  conf[x].phi = complex<double> ( + real(conf[x].phi) * V2diff + 2 * imag(conf[x].phi) * Vprod,
+                                 - imag(conf[x].phi) * V2diff + 2 * real(conf[x].phi) * Vprod ) / norm(V);
+  
+  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() {
+  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