From d05753ca05e145e154aef179d9f02b9e64612cc9 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 Sep 2013 20:08:32 +0200 Subject: MathematicaCompat.h: Remove Fortran support --- .../GenericFD/src/MathematicaCompat.h | 35 +++++----------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'Auxiliary') diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h index b0c1eaf..66994e5 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h @@ -2,20 +2,11 @@ #define Power(x, y) (pow(x,y)) #define Sqrt(x) (sqrt(x)) - -#ifdef KRANC_C -# define Abs(x) (fabs(x)) -# define Min(x, y) (fmin(x,y)) -# define Min3(x, y, z) (fmin(fmin((x), (y)), (z))) -# define Max(x, y) (fmax(x,y)) -# 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 IfThen(x,y,z) ((x)*(y) + (1-(x))*(z)) -#endif +#define Abs(x) (fabs(x)) +#define Min(x, y) (fmin(x,y)) +#define Min3(x, y, z) (fmin(fmin((x), (y)), (z))) +#define Max(x, y) (fmax(x,y)) +#define IfThen(x,y,z) ((x) ? (y) : (z)) #define Exp(x) (exp(x)) #define Log(x) (log(x)) @@ -43,23 +34,13 @@ #define Sign(x) (sgn(x)) -#ifdef KRANC_C -# define ToReal(x) ((CCTK_REAL)(x)) -#else -# define ToReal(x) (real((x),kind(khalf))) -#endif +#define ToReal(x) ((CCTK_REAL)(x)) #define MinMod(x, y) ((x) * (y) < 0 ? 0 : (fabs((x)) < fabs((y)) ? (x) : (y))) #define VanLeer(x, y) ((x) * (y) < 0 ? 0 : (Min3(2*fabs(x),2*fabs(y),0.5*(fabs(x)+fabs(y)))*Sign((x)+(y)))) -#ifdef KRANC_C -# define E M_E -# define Pi M_PI - -#else -# define E 2.71828182845904523536029d0 -# define Pi 3.14159265358979323846264d0 -#endif +#define E M_E +#define Pi M_PI #define StepFunction(x) ((x)>0) -- cgit v1.2.3