From 7a2a209a8e67d342eb4faa2fa203a94fb68d5e6c Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <alex@treefish.org>
Date: Thu, 14 Nov 2013 20:05:04 +0100
Subject: [PATCH] Made algorithm names more meaningful.

---
 .gitignore                         |  7 +++----
 CMakeLists.txt                     | 18 +++++++++---------
 heatbath.cpp                       | 18 +++++++++---------
 sim-heatless.hpp => sim-1mr.hpp    |  0
 sim-relaxedheat.hpp => sim-nor.hpp |  0
 sim-usualheat.hpp => sim-r.hpp     |  0
 6 files changed, 21 insertions(+), 22 deletions(-)
 rename sim-heatless.hpp => sim-1mr.hpp (100%)
 rename sim-relaxedheat.hpp => sim-nor.hpp (100%)
 rename sim-usualheat.hpp => sim-r.hpp (100%)

diff --git a/.gitignore b/.gitignore
index abf17c1..356965e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
 *~
-heatbath
 cmake_install.cmake
 Makefile
 CMakeCache.txt
 CMakeFiles
 data
-heatbath-heatless
-heatbath-relaxedheat
-heatbath-usualheat
+heatbath-nor
+heatbath-1mr
+heatbath-r
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c90e8c9..1840155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,14 +11,14 @@ SET(CMAKE_BUILD_TYPE Release)
 
 add_subdirectory(latlib)
 
-add_executable(heatbath-heatless heatbath.cpp)
-set_target_properties(heatbath-heatless PROPERTIES COMPILE_DEFINITIONS "HEATLESS_ALGORITHM")
-target_link_libraries(heatbath-heatless o815 gsl gslcblas lat_neigh)
+add_executable(heatbath-nor heatbath.cpp)
+set_target_properties(heatbath-nor PROPERTIES COMPILE_DEFINITIONS "ALGORITHM_NOR")
+target_link_libraries(heatbath-nor o815 gsl gslcblas lat_neigh)
 
-add_executable(heatbath-usualheat heatbath.cpp)
-set_target_properties(heatbath-usualheat PROPERTIES COMPILE_DEFINITIONS "USUALHEAT_ALGORITHM")
-target_link_libraries(heatbath-usualheat o815 gsl gslcblas lat_neigh)
+add_executable(heatbath-r heatbath.cpp)
+set_target_properties(heatbath-r PROPERTIES COMPILE_DEFINITIONS "ALGORITHM_R")
+target_link_libraries(heatbath-r o815 gsl gslcblas lat_neigh)
 
-add_executable(heatbath-relaxedheat heatbath.cpp)
-set_target_properties(heatbath-relaxedheat PROPERTIES COMPILE_DEFINITIONS "RELAXEDHEAT_ALGORITHM")
-target_link_libraries(heatbath-relaxedheat o815 gsl gslcblas lat_neigh)
+add_executable(heatbath-1mr heatbath.cpp)
+set_target_properties(heatbath-1mr PROPERTIES COMPILE_DEFINITIONS "ALGORITHM_1MR")
+target_link_libraries(heatbath-1mr o815 gsl gslcblas lat_neigh)
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
diff --git a/sim-heatless.hpp b/sim-1mr.hpp
similarity index 100%
rename from sim-heatless.hpp
rename to sim-1mr.hpp
diff --git a/sim-relaxedheat.hpp b/sim-nor.hpp
similarity index 100%
rename from sim-relaxedheat.hpp
rename to sim-nor.hpp
diff --git a/sim-usualheat.hpp b/sim-r.hpp
similarity index 100%
rename from sim-usualheat.hpp
rename to sim-r.hpp
-- 
2.39.5