cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting: defines stay indented if clang-format is turned off temporarily

Browse Source
This commit is contained in:
jpekkila
2019-06-27 13:31:50 +03:00
parent 8ca09668c1
commit 30c21ff420
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
include/astaroth.h
View File

@@ -67,16 +67,18 @@ extern "C" {
// logical switches // logical switches
#include "user.h" #include "user.h"
// clang-format off
#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 LDENSITY (1) #define LDENSITY (1)
#define LHYDRO (1) #define LHYDRO (1)
#define LINDUCTION (1) // %JP: TO BE RENAMED TO LMAGNETIC TODO #define LINDUCTION (1) // %JP: TO BE RENAMED TO LMAGNETIC TODO
#define LENTROPY (1) #define LENTROPY (1)
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LFORCING (1) #define LFORCING (1)
#endif #endif
// clang-format on
#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
@@ -208,22 +210,19 @@ extern "C" {
#define AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC) #define AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC)
#endif #endif
//MR: Temperature must not have an additional variable slot, but should sit on the
// same as entropy.
#if LTEMPERATURE
#define AC_FOR_TEMPERATURE_VTXBUF_HANDLES(FUNC)\
FUNC(VTXBUF_TEMPERATURE),
#else
#define AC_FOR_TEMPERATURE_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) \
AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \ AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \
//MR: Temperature must not have an additional variable slot, but should sit on the
// same as entropy.
#ifndef USER_PROVIDED
#if LTEMPERATURE
#define AC_FOR_TEMPERATURE_VTXBUF_HANDLES(FUNC)\
FUNC(VTXBUF_TEMPERATURE),
#else
#define AC_FOR_TEMPERATURE_VTXBUF_HANDLES(FUNC)
#endif
#endif
// clang-format on // clang-format on
/* /*
@@ -231,19 +230,21 @@ extern "C" {
* Single/double precision switch * Single/double precision switch
* ============================================================================= * =============================================================================
*/ */
// clang-format off
#if AC_DOUBLE_PRECISION == 1 #if AC_DOUBLE_PRECISION == 1
typedef double AcReal; typedef double AcReal;
typedef double3 AcReal3; typedef double3 AcReal3;
#define AC_REAL_MAX (DBL_MAX) #define AC_REAL_MAX (DBL_MAX)
#define AC_REAL_MIN (DBL_MIN) #define AC_REAL_MIN (DBL_MIN)
#define AC_REAL_EPSILON (DBL_EPSILON) #define AC_REAL_EPSILON (DBL_EPSILON)
#else #else
typedef float AcReal; typedef float AcReal;
typedef float3 AcReal3; typedef float3 AcReal3;
#define AC_REAL_MAX (FLT_MAX) #define AC_REAL_MAX (FLT_MAX)
#define AC_REAL_MIN (FLT_MIN) #define AC_REAL_MIN (FLT_MIN)
#define AC_REAL_EPSILON (FLT_EPSILON) #define AC_REAL_EPSILON (FLT_EPSILON)
#endif #endif
// clang-format on
typedef struct { typedef struct {
AcReal3 row[3]; AcReal3 row[3];