diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2011-06-04 12:03:13 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2011-06-04 12:03:13 +0200 |
| commit | 65be468ae2b5bd42c6eb5f9fcf27bc5c7b33c6dc (patch) | |
| tree | 24eaaac94e8af326249a5620299ff5ccc48744ad /Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h | |
| parent | e3e8004e09b6a1a2cc0941d979ea65b213581b4a (diff) | |
MathematicaCompat.h: Fix merge error
Diffstat (limited to 'Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h')
| -rw-r--r-- | Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h index e48daa2..18cbb7e 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h @@ -17,9 +17,11 @@ #endif #ifdef KRANC_C -#define Sign(x) (signbit(x)?-1:+1) +# define Sign(x) (copysign(1.0,(x))) +# define ToReal(x) ((CCTK_REAL)(x)) #else -#define Sign(x) (sgn(x)) +# define Sign(x) (sgn(x)) +# define ToReal(x) (real((x),kind(khalf))) #endif #define MinMod(x, y) ((x) * (y) < 0 ? 0 : (fabs((x)) < fabs((y)) ? (x) : (y))) @@ -41,13 +43,6 @@ #define Cosh(x) (cosh(x)) #define Tanh(x) (tanh(x)) -#ifdef KRANC_C -# define Sign(x) (copysign(1.0,(x))) -# define ToReal(x) ((CCTK_REAL)(x)) -#else -# define Sign(x) (sgn(x)) -# define ToReal(x) (real((x),kind(khalf))) -#endif #if 0 |