Skip to content
Snippets Groups Projects
Commit e7abc42c authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

change gear --> GEAR throughout the code.

parent 05903bd3
No related branches found
No related tags found
1 merge request!537Master configuration options for the subgrid models
...@@ -48,7 +48,7 @@ AM_PROG_CC_C_O ...@@ -48,7 +48,7 @@ AM_PROG_CC_C_O
# As an example for this, see the call to AC_ARG_WITH for cooling. # As an example for this, see the call to AC_ARG_WITH for cooling.
AC_ARG_WITH([subgrid], AC_ARG_WITH([subgrid],
[AS_HELP_STRING([--with-subgrid=<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="$withval"],
[with_subgrid=none] [with_subgrid=none]
...@@ -65,9 +65,9 @@ case "$with_subgrid" in ...@@ -65,9 +65,9 @@ case "$with_subgrid" in
;; ;;
none) none)
;; ;;
gear) GEAR)
with_subgrid_cooling=grackle with_subgrid_cooling=grackle
with_subgrid_chemistry=gear with_subgrid_chemistry=GEAR
with_subgrid_hydro=gadget2 with_subgrid_hydro=gadget2
;; ;;
EAGLE) EAGLE)
...@@ -1096,7 +1096,7 @@ esac ...@@ -1096,7 +1096,7 @@ esac
# chemistry function # chemistry function
AC_ARG_WITH([chemistry], AC_ARG_WITH([chemistry],
[AS_HELP_STRING([--with-chemistry=<function>], [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="$withval"],
[with_chemistry="none"] [with_chemistry="none"]
...@@ -1114,7 +1114,7 @@ case "$with_chemistry" in ...@@ -1114,7 +1114,7 @@ case "$with_chemistry" in
none) none)
AC_DEFINE([CHEMISTRY_NONE], [1], [No chemistry function]) AC_DEFINE([CHEMISTRY_NONE], [1], [No chemistry function])
;; ;;
gear) GEAR)
AC_DEFINE([CHEMISTRY_GEAR], [1], [Chemistry taken from the GEAR model]) AC_DEFINE([CHEMISTRY_GEAR], [1], [Chemistry taken from the GEAR model])
;; ;;
EAGLE) EAGLE)
......
...@@ -131,10 +131,10 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h ...@@ -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_io.h \
chemistry/none/chemistry_struct.h \ chemistry/none/chemistry_struct.h \
chemistry/none/chemistry_iact.h \ chemistry/none/chemistry_iact.h \
chemistry/gear/chemistry.h \ chemistry/GEAR/chemistry.h \
chemistry/gear/chemistry_io.h \ chemistry/GEAR/chemistry_io.h \
chemistry/gear/chemistry_struct.h \ chemistry/GEAR/chemistry_struct.h \
chemistry/gear/chemistry_iact.h \ chemistry/GEAR/chemistry_iact.h \
chemistry/EAGLE/chemistry.h \ chemistry/EAGLE/chemistry.h \
chemistry/EAGLE/chemistry_io.h \ chemistry/EAGLE/chemistry_io.h \
chemistry/EAGLE/chemistry_struct.h\ chemistry/EAGLE/chemistry_struct.h\
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include "./chemistry/none/chemistry.h" #include "./chemistry/none/chemistry.h"
#include "./chemistry/none/chemistry_iact.h" #include "./chemistry/none/chemistry_iact.h"
#elif defined(CHEMISTRY_GEAR) #elif defined(CHEMISTRY_GEAR)
#include "./chemistry/gear/chemistry.h" #include "./chemistry/GEAR/chemistry.h"
#include "./chemistry/gear/chemistry_iact.h" #include "./chemistry/GEAR/chemistry_iact.h"
#elif defined(CHEMISTRY_EAGLE) #elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry.h" #include "./chemistry/EAGLE/chemistry.h"
#include "./chemistry/EAGLE/chemistry_iact.h" #include "./chemistry/EAGLE/chemistry_iact.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_CHEMISTRY_EAGLE_H #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 * @brief Empty infrastructure for the cases without chemistry function
*/ */
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_CHEMISTRY_GEAR_H #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 * @brief Empty infrastructure for the cases without chemistry function
*/ */
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#if defined(CHEMISTRY_NONE) #if defined(CHEMISTRY_NONE)
#include "./chemistry/none/chemistry_io.h" #include "./chemistry/none/chemistry_io.h"
#elif defined(CHEMISTRY_GEAR) #elif defined(CHEMISTRY_GEAR)
#include "./chemistry/gear/chemistry_io.h" #include "./chemistry/GEAR/chemistry_io.h"
#elif defined(CHEMISTRY_EAGLE) #elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry_io.h" #include "./chemistry/EAGLE/chemistry_io.h"
#else #else
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#if defined(CHEMISTRY_NONE) #if defined(CHEMISTRY_NONE)
#include "./chemistry/none/chemistry_struct.h" #include "./chemistry/none/chemistry_struct.h"
#elif defined(CHEMISTRY_GEAR) #elif defined(CHEMISTRY_GEAR)
#include "./chemistry/gear/chemistry_struct.h" #include "./chemistry/GEAR/chemistry_struct.h"
#elif defined(CHEMISTRY_EAGLE) #elif defined(CHEMISTRY_EAGLE)
#include "./chemistry/EAGLE/chemistry_struct.h" #include "./chemistry/EAGLE/chemistry_struct.h"
#else #else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment