From 65c8a39cb9156ad938b2fa0e14bdbcbbde3bfd15 Mon Sep 17 00:00:00 2001
From: jpekkila <johannes.pekkila@aalto.fi>
Date: Wed, 26 Jun 2019 18:56:40 +0300
Subject: [PATCH] Removed old comments and renamed USER_PROVIDED to
 USER_PROVIDED_DEFINES to be more explicit

---
 include/astaroth.h | 17 +++--------------
 include/user.h     |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/astaroth.h b/include/astaroth.h
index 483f9ba..42197bc 100644
--- a/include/astaroth.h
+++ b/include/astaroth.h
@@ -63,21 +63,11 @@ extern "C" {
  * Compile-time constants used during simulation (user definable)
  * =============================================================================
  */
-
-///////////// PAD TEST
-// NOTE: works only with nx is divisible by 32
-//#define PAD_LEAD (32 - STENCIL_ORDER/2)
-//#define PAD_SIZE (32 - STENCIL_ORDER)
-///////////// PAD TEST
-
-// L-prefix inherited from the old Astaroth, no idea what it means
-// MV: L means a Logical switch variale, something having true of false value.
-// Note: forcing is disabled currently in the files generated by acc (compiler of our DSL)
-//
+// USER_PROVIDED_DEFINES must be defined in user.h if the user wants to override the following
+// logical switches
 #include "user.h"
 
-#ifndef USER_PROVIDED
-
+#ifndef USER_PROVIDED_DEFINES
   #define STENCIL_ORDER (6)
   #define NGHOST (STENCIL_ORDER/2)
   #define LHYDRO (1)
@@ -87,7 +77,6 @@ extern "C" {
   #define LENTROPY (1)
   #define LTEMPERATURE (0)
   #define LMAGNETIC LINDUCTION
-
 #endif
 
 #define AC_THERMAL_CONDUCTIVITY (AcReal(0.001)) // TODO: make an actual config parameter
diff --git a/include/user.h b/include/user.h
index 72e2268..c2075b4 100644
--- a/include/user.h
+++ b/include/user.h
@@ -11,6 +11,6 @@
   #else
     #define AC_DOUBLE_PRECISION 0
   #endif
-  #define USER_PROVIDED
+  #define USER_PROVIDED_DEFINES
 #endif