Added 1mr+ algorithm.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index c95ecf56b8a3da6ec84739cc916def552001dd26..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
@@ -56,7 +59,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 +78,6 @@ int main (int argc, char *argv[])
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();
-
-  cout << "here" << endl;
   
   O815->mainLoop();