Implemented nor algorithm.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index e6a7803c3c93ab828170f99df2e12fbc160d9ef9..dbfe63ae7aa2bd0f52455d22a951fe212e87418b 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -2,15 +2,15 @@
 
 #include "latlib/o815/o815.h"
 
-#ifdef HEATLESS_ALGORITHM
-#define ALGORITHM "heatless"
-#include "sim-heatless.hpp"
-#elif USUALHEAT_ALGORITHM
-#define ALGORITHM "usualheat"
-#include "sim-usualheat.hpp"
-#elif RELAXEDHEAT_ALGORITHM
-#define ALGORITHM "relaxedheat"
-#include "sim-relaxedheat.hpp"
+#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"
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif