X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/0f8b9f29fdcc92049803e88be1c9524d6d0d6fab..12768df08df597a1e6858b5d2e735bbea58fff61:/heatbath.cpp?ds=sidebyside

diff --git a/heatbath.cpp b/heatbath.cpp
index c95ecf5..8df557b 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -1,20 +1,43 @@
 #include <complex>
+#include <cstring>
 
 #include "latlib/o815/o815.h"
 
-#ifdef ALGORITHM_NOR
-#define ALGORITHM "nor"
-#include "sim-nor.hpp"
-#elif ALGORITHM_R
-#define ALGORITHM "r"
-#include "sim-r.hpp"
-#elif ALGORITHM_1MR
-#define ALGORITHM "1mr"
-#include "sim-1mr.hpp"
+#ifdef ALGORITHM_METRO
+#define ALGORITHM "metro"
+#include "sim-metro.hpp"
+#elif ALGORITHM_AHBMHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbMhb"
+#elif ALGORITHM_AHBMOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbMor"
+#elif ALGORITHM_AORMHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorMhb"
+#elif ALGORITHM_AORMOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorMor"
+#elif ALGORITHM_AORM0
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorM0"
+#elif ALGORITHM_AHBM0
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbM0"
+#elif ALGORITHM_A0MOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "A0Mor"
+#elif ALGORITHM_A0MHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "A0Mhb"
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
+#ifdef NONMETRO_A_HB
+#error SADSADS
+#endif
+
 o815 *O815;
 sim *Sim;
 
@@ -56,7 +79,7 @@ void parseLonelyArgs()
       O815->observables.push_back(new obs_phi2_hist(O815));
     }
     else if ( strcmp(*lonit, "phip2_hist") == 0 ) {
-      *O815->out->log << "MASTER: registered observable: phi2p_hist" << endl << flush;
+      *O815->out->log << "MASTER: registered observable: phip2_hist" << endl << flush;
       O815->observables.push_back(new obs_phip2_hist(O815));
     }
   }
@@ -75,8 +98,6 @@ int main (int argc, char *argv[])
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();
-
-  cout << "here" << endl;
   
   O815->mainLoop();