[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 31a25623690d6cb5716d130b234a11d38b853577
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jan 11 10:10:30 2008 +1100

    New intersection, union and difference predefined macros
    
    darcs-hash:20080110231030-d4795-f5281a8fa9105f1f1b67ac9345efda6eae80a77b.gz

diff --git a/src/spatial.h b/src/spatial.h
index 931dea0..553cd26 100644
--- a/src/spatial.h
+++ b/src/spatial.h
@@ -24,6 +24,10 @@
  * http://gfs.sourceforge.net/wiki/index.php/GfsSurface
  */
 
+#define intersection(a,b) MAX(a, b)
+#define union(a,b)        MIN(a, b)
+#define difference(a,b)   MAX(a, -(b))
+
 static double _x = 0., _y = 0., _z = 0.;
 
 static double ellipse (double xc, double yc, double a, double b)

-- 
Gerris Flow Solver