Renamed and redefined algorithms.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index 6491da953ec8a85a8ded08c7a3c0455b8fe0e52f..9744b3304206bef8e913ded9c644c237d1a69f61 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -2,31 +2,29 @@
 
 #include "latlib/o815/o815.h"
 
 
 #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"
-#elif ALGORITHM_1MRPLUS
-#define ALGORITHM "1mr+"
-#include "sim-1mr+.hpp"
-#elif ALGORITHM_1MRMINUS
-#define ALGORITHM "1mr-"
-#include "sim-1mr-.hpp"
-#elif ALGORITHM_RMINUS
-#define ALGORITHM "r-"
-#include "sim-r-.hpp"
-#elif ALGORITHM_RPLUS
-#define ALGORITHM "r+"
-#include "sim-r+.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"

 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 

+#ifdef NONMETRO_A_HB
+#error SADSADS
+#endif
+

 o815 *O815;
 sim *Sim;
 
 o815 *O815;
 sim *Sim;