Renamed and redefined algorithms.

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

diff --git a/sim-nor.hpp b/sim-nor.hpp
deleted file mode 100644 (file)
index 7bb4a7c..0000000
--- a/sim-nor.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef SIM_HPP
-#define SIM_HPP
-
-#include <gsl/gsl_rng.h>
-#include <complex>
-#include <math.h>
-
-#include "latlib/neigh.h"
-
-#define EPSILONPHI 0.5
-
-class sim : public o815::sim {
-public:
-  struct siteconf {
-    complex<double> phi;
-  };
-  sim(o815 *_O815);
-  siteconf* conf;
-  unsigned int LSIZE2;
-
-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);
-};
-
-
-
-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::_makeSweep() {  
-  for (int ix = 0; ix < LSIZE2; ix++)
-    updatePhi(ix);
-}
-
-void sim::_newParas() {
-  M = pow( (*O815->paraQ)["mass"], 2 ) + 4;
-  *log << "SIM: Resetting fields." << endl << flush;
-  memset(conf, 0, sizeof(siteconf)*LSIZE2);
-}
-
-int sim::updatePhi(const int& x) {
-  complex<double> phixCandidate = conf[x].phi +
-    complex<double> ( 2*EPSILONPHI*( 0.5 - gsl_rng_uniform(rangsl) ), 
-                     2*EPSILONPHI*( 0.5 - gsl_rng_uniform(rangsl) ) );
-  
-  if ( gsl_rng_uniform(rangsl) < rhoPhi(x, phixCandidate) ) {
-    conf[x].phi = phixCandidate;
-    return 1;
-  }
-  
-  return 0;
-}
-
-double sim::rhoPhi(const int& x, const complex<double>& phixCandidate) {
-  return exp( SofPhi(x, conf[x].phi) - SofPhi(x, phixCandidate) );
-}
-
-double sim::SofPhi(const int& x, const complex<double>& phix) {
-  double sofphi = M * norm(phix);
-  
-  for (int nu=0; nu<4; nu++)
-    sofphi -= 2 * real( conj(phix) * conf[ (*nb)[x*4+nu] ].phi );
-  
-  return sofphi;
-}
-
-#endif