diff options
| author | Barry Wardell <barry.wardell@gmail.com> | 2012-02-09 10:12:48 +0000 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-02-09 10:12:48 +0000 |
| commit | 64f15729d15b7b23488e870942f2ff5600d2ec28 (patch) | |
| tree | 783a97d6b79c1a9c60353a7e4aa89af479cae4b9 /Auxiliary | |
| parent | c5aecd6c7d1b69e8e79552b900c576eb14b120ec (diff) | |
| parent | 72eefa3dd9e1ebdca001de5bc1497f83675b265a (diff) | |
Merge remote-tracking branch 'origin/cakernel'
Conflicts:
Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h
Tools/CodeGen/CalculationFunction.m
Tools/CodeGen/CodeGenCactus.m
Tools/CodeGen/Differencing.m
Tools/CodeGen/KrancThorn.m
Tools/CodeGen/Schedule.m
Diffstat (limited to 'Auxiliary')
| -rw-r--r-- | Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h index 390fb6a..a0e5540 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h @@ -2,6 +2,7 @@ # define IfThen(x,y,z) ((x) ? (y) : (z)) #else # define Abs(x) (abs(x)) +# define IntAbs(x) (abs(x)) # define Min(x, y) (min(x,y)) # define Max(x, y) (max(x,y)) # define Sqrt(x) (sqrt(x)) @@ -9,7 +10,7 @@ #endif #ifdef KRANC_C -# define Sign(x) (copysign(1.0,(x))) +# define Sign(x) (copysign( (CCTK_REAL) 1.0,(CCTK_REAL) (x))) # define ToReal(x) ((CCTK_REAL)(x)) #else # define Sign(x) (sgn(x)) |