diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-11-20 19:10:09 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-11-20 19:10:09 -0500 |
| commit | 9278fba82ebd63f03c88317e7843fd55d97870b6 (patch) | |
| tree | 92f1838b266d67d94b9eaa49b3bde58d177d9c71 /Auxiliary | |
| parent | cf8b0b12aa9938160f36ae9b3bab5f4d8c8c709e (diff) | |
| parent | b0019939fb9ef98a05431967a4cc2139f0f2a1e4 (diff) | |
Merge branch 'master' into eschnett/dgfe
Conflicts:
Tools/CodeGen/Jacobian.m
Diffstat (limited to 'Auxiliary')
| -rw-r--r-- | Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h index 28bcebc..b0c1eaf 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h @@ -6,6 +6,7 @@ #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 |