Changeset 8189 for trunk/anuga_work/development/2010-projects/anuga_1d/base

Timestamp:

Jul 1, 2011, 2:52:36 PM (14 years ago)

Author:

steve

Message:

Added in Sudi's most recent 1d codes

Location:

trunk/anuga_work/development/2010-projects/anuga_1d/base

Files:

• limiters_python.py (modified) (2 diffs)
• quantity_ext.c (modified) (2 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/base/limiters_python.py

@@ -12 +12 @@
     from numpy import abs, where
 
-    phi = where((abs(a) < abs(b)) & (a*b > 0.0), a, 0.0)
-    phi = where((abs(b) < abs(a)) & (a*b > 0.0), b, phi)
+    phi = where((abs(a) < abs(b)) & (a*b >= 0.0), a, 0.0)
+    phi = where((abs(b) < abs(a)) & (a*b >= 0.0), b, phi)
 
     return phi
@@ -20 +20 @@
     from numpy import sign, abs, minimum, where
 
-    return where( (sign(a)*sign(b) > 0.0) & (sign(a)*sign(c)>0.0),
+    return where( (sign(a)*sign(b) >= 0.0) & (sign(a)*sign(c)>0.0),
         sign(a)*minimum(minimum(abs(a),abs(b)),abs(c)), 0.0 )
 

trunk/anuga_work/development/2010-projects/anuga_1d/base/quantity_ext.c

@@ -88 +88 @@
 
           phi = 0.0;
-          if ((fabs(a) < fabs(b)) & (a*b > 0.0 )) {
+          if ((fabs(a) < fabs(b)) & (a*b >= 0.0 )) {
               phi = a;
           }
-          if ((fabs(b) < fabs(a)) & (a*b > 0.0 )) {
+          if ((fabs(b) < fabs(a)) & (a*b >= 0.0 )) {
               phi = b;
           }
@@ -191 +191 @@
 
           phi = 0.0;
-          if ((sign(a)*sign(b) > 0.0) & (sign(a)*sign(c) > 0.0 )) {
+          if ((sign(a)*sign(b) > 0.0) & (sign(a)*sign(c) >= 0.0 )) {
               phi = sign(a)*min(theta*min(fabs(a),fabs(b)),fabs(c));
           }