From e7abc42cede6dd2a6a939a9f153c0e3d1457799e Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Tue, 1 May 2018 13:14:31 +0100
Subject: [PATCH] change gear --> GEAR throughout the code.
---
configure.ac | 10 +++++-----
src/Makefile.am | 8 ++++----
src/chemistry.h | 4 ++--
src/chemistry/EAGLE/chemistry.h | 2 +-
src/chemistry/{gear => GEAR}/chemistry.h | 2 +-
src/chemistry/{gear => GEAR}/chemistry_iact.h | 0
src/chemistry/{gear => GEAR}/chemistry_io.h | 0
src/chemistry/{gear => GEAR}/chemistry_struct.h | 0
src/chemistry_io.h | 2 +-
src/chemistry_struct.h | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
rename src/chemistry/{gear => GEAR}/chemistry.h (99%)
rename src/chemistry/{gear => GEAR}/chemistry_iact.h (100%)
rename src/chemistry/{gear => GEAR}/chemistry_io.h (100%)
rename src/chemistry/{gear => GEAR}/chemistry_struct.h (100%)
diff --git a/configure.ac b/configure.ac
index fe2916ead8..aa717b0d9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AM_PROG_CC_C_O
# As an example for this, see the call to AC_ARG_WITH for cooling.
AC_ARG_WITH([subgrid],
[AS_HELP_STRING([--with-subgrid=<subgrid>],
- [Master switch for subgrid methods. Inexperienced user should start from here @<:@none, gear, EAGLE default: none@:>@]
+ [Master switch for subgrid methods. Inexperienced user should start from here @<:@none, GEAR, EAGLE default: none@:>@]
)],
[with_subgrid="$withval"],
[with_subgrid=none]
@@ -65,9 +65,9 @@ case "$with_subgrid" in
;;
none)
;;
- gear)
+ GEAR)
with_subgrid_cooling=grackle
- with_subgrid_chemistry=gear
+ with_subgrid_chemistry=GEAR
with_subgrid_hydro=gadget2
;;
EAGLE)
@@ -1096,7 +1096,7 @@ esac
# chemistry function
AC_ARG_WITH([chemistry],
[AS_HELP_STRING([--with-chemistry=<function>],
- [chemistry function @<:@none, gear, EAGLE default: none@:>@]
+ [chemistry function @<:@none, GEAR, EAGLE default: none@:>@]
)],
[with_chemistry="$withval"],
[with_chemistry="none"]
@@ -1114,7 +1114,7 @@ case "$with_chemistry" in
none)
AC_DEFINE([CHEMISTRY_NONE], [1], [No chemistry function])
;;
- gear)
+ GEAR)
AC_DEFINE([CHEMISTRY_GEAR], [1], [Chemistry taken from the GEAR model])
;;
EAGLE)
diff --git a/src/Makefile.am b/src/Makefile.am
index d8b633fe1e..5e8de64d21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,10 +131,10 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
chemistry/none/chemistry_io.h \
chemistry/none/chemistry_struct.h \
chemistry/none/chemistry_iact.h \
- chemistry/gear/chemistry.h \
- chemistry/gear/chemistry_io.h \
- chemistry/gear/chemistry_struct.h \
- chemistry/gear/chemistry_iact.h \
+ chemistry/GEAR/chemistry.h \
+ chemistry/GEAR/chemistry_io.h \
+ chemistry/GEAR/chemistry_struct.h \
+ chemistry/GEAR/chemistry_iact.h \
chemistry/EAGLE/chemistry.h \
chemistry/EAGLE/chemistry_io.h \
chemistry/EAGLE/chemistry_struct.h\
diff --git a/src/chemistry.h b/src/chemistry.h
index 77b8d5b5fa..bacc15c483 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -33,8 +33,8 @@
#include "./chemistry/none/chemistry.h"
#include "./chemistry/none/chemistry_iact.h"
#elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry.h"
-#include "./chemistry/gear/chemistry_iact.h"
+#include "./chemistry/GEAR/chemistry.h"
+#include "./chemistry/GEAR/chemistry_iact.h"
#elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry.h"
#include "./chemistry/EAGLE/chemistry_iact.h"
diff --git a/src/chemistry/EAGLE/chemistry.h b/src/chemistry/EAGLE/chemistry.h
index fa63c8cc87..459de24ef3 100644
--- a/src/chemistry/EAGLE/chemistry.h
+++ b/src/chemistry/EAGLE/chemistry.h
@@ -20,7 +20,7 @@
#define SWIFT_CHEMISTRY_EAGLE_H
/**
- * @file src/chemistry/gear/chemistry.h
+ * @file src/chemistry/EAGLE/chemistry.h
* @brief Empty infrastructure for the cases without chemistry function
*/
diff --git a/src/chemistry/gear/chemistry.h b/src/chemistry/GEAR/chemistry.h
similarity index 99%
rename from src/chemistry/gear/chemistry.h
rename to src/chemistry/GEAR/chemistry.h
index 5321a5a963..a51051ca3a 100644
--- a/src/chemistry/gear/chemistry.h
+++ b/src/chemistry/GEAR/chemistry.h
@@ -20,7 +20,7 @@
#define SWIFT_CHEMISTRY_GEAR_H
/**
- * @file src/chemistry/gear/chemistry.h
+ * @file src/chemistry/GEAR/chemistry.h
* @brief Empty infrastructure for the cases without chemistry function
*/
diff --git a/src/chemistry/gear/chemistry_iact.h b/src/chemistry/GEAR/chemistry_iact.h
similarity index 100%
rename from src/chemistry/gear/chemistry_iact.h
rename to src/chemistry/GEAR/chemistry_iact.h
diff --git a/src/chemistry/gear/chemistry_io.h b/src/chemistry/GEAR/chemistry_io.h
similarity index 100%
rename from src/chemistry/gear/chemistry_io.h
rename to src/chemistry/GEAR/chemistry_io.h
diff --git a/src/chemistry/gear/chemistry_struct.h b/src/chemistry/GEAR/chemistry_struct.h
similarity index 100%
rename from src/chemistry/gear/chemistry_struct.h
rename to src/chemistry/GEAR/chemistry_struct.h
diff --git a/src/chemistry_io.h b/src/chemistry_io.h
index 2a690b6a85..877f96b048 100644
--- a/src/chemistry_io.h
+++ b/src/chemistry_io.h
@@ -26,7 +26,7 @@
#if defined(CHEMISTRY_NONE)
#include "./chemistry/none/chemistry_io.h"
#elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry_io.h"
+#include "./chemistry/GEAR/chemistry_io.h"
#elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry_io.h"
#else
diff --git a/src/chemistry_struct.h b/src/chemistry_struct.h
index aa8cfb3696..ffeecb3cef 100644
--- a/src/chemistry_struct.h
+++ b/src/chemistry_struct.h
@@ -31,7 +31,7 @@
#if defined(CHEMISTRY_NONE)
#include "./chemistry/none/chemistry_struct.h"
#elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry_struct.h"
+#include "./chemistry/GEAR/chemistry_struct.h"
#elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry_struct.h"
#else
--
GitLab