Reordered logical flags in a more logical order, density -> hydro -> induction -> entropy -> others

This commit is contained in:
jpekkila
2019-06-27 13:22:14 +03:00
parent 75fb756ad4
commit fc96283c37

View File

@@ -70,13 +70,12 @@ extern "C" {
#ifndef USER_PROVIDED_DEFINES #ifndef USER_PROVIDED_DEFINES
#define STENCIL_ORDER (6) #define STENCIL_ORDER (6)
#define NGHOST (STENCIL_ORDER / 2) #define NGHOST (STENCIL_ORDER / 2)
#define LHYDRO (1)
#define LDENSITY (1) #define LDENSITY (1)
#define LFORCING (1) #define LHYDRO (1)
#define LINDUCTION (1) #define LINDUCTION (1)
#define LENTROPY (1) #define LENTROPY (1)
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LMAGNETIC LINDUCTION #define LFORCING (1)
#endif #endif
#define AC_THERMAL_CONDUCTIVITY (AcReal(0.001)) // TODO: make an actual config parameter #define AC_THERMAL_CONDUCTIVITY (AcReal(0.001)) // TODO: make an actual config parameter
@@ -177,6 +176,13 @@ extern "C" {
* ============================================================================= * =============================================================================
*/ */
// clang-format off // clang-format off
#ifdef LDENSITY
#define AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) \
FUNC(VTXBUF_LNRHO),
#else
#define AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC)
#endif
#ifdef LHYDRO #ifdef LHYDRO
#define AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) \ #define AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) \
FUNC(VTXBUF_UUX), \ FUNC(VTXBUF_UUX), \
@@ -186,11 +192,13 @@ extern "C" {
#define AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) #define AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC)
#endif #endif
#ifdef LDENSITY #ifdef LINDUCTION
#define AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) \ #define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \
FUNC(VTXBUF_LNRHO), FUNC(VTXBUF_AX), \
FUNC(VTXBUF_AY), \
FUNC(VTXBUF_AZ),
#else #else
#define AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) #define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)
#endif #endif
#ifdef LENTROPY #ifdef LENTROPY
@@ -200,15 +208,6 @@ extern "C" {
#define AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC) #define AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC)
#endif #endif
#ifdef LMAGNETIC
#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \
FUNC(VTXBUF_AX), \
FUNC(VTXBUF_AY), \
FUNC(VTXBUF_AZ),
#else
#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)
#endif
#define AC_FOR_VTXBUF_HANDLES(FUNC) AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) \ #define AC_FOR_VTXBUF_HANDLES(FUNC) AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) \
AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) \ AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) \
AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC) \ AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC) \