X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/d017fdeec8363b3e871692219bb7eacb614a41f1..7a2a209a8e67d342eb4faa2fa203a94fb68d5e6c:/heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index e6a7803..dbfe63a 100644
--- 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