Changeset 998 for inundation/ga

Timestamp:

Mar 4, 2005, 11:51:07 AM (20 years ago)

Author:

ole

Message:

Playing with h_limiter

Location:

inundation/ga/storm_surge/pyvolution

Files:

• shallow_water.py (modified) (1 diff)
• shallow_water_ext.c (modified) (5 diffs)
• test_util.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -700 +700 @@
     #Call C-extension
     from shallow_water_ext import h_limiter
-    hvbar = h_limiter(domain, hc, hv)
-
-    return hvbar
+    h_limiter(domain, hc, hv)
+
+    return hv
 
                                             

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -261 +261 @@
         wv[k3+i] = zv[k3+i] + (1-alpha)*hvbar[k3+i] + alpha*hv[k3+i];
             
-      
         //Update momentum as a linear combination of 
         //xmomc and ymomc (shallow) and momentum
@@ -772 +771 @@
   dimensions[0] = N;
   dimensions[1] = 3;  
-  hvbar = (PyArrayObject *) PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
-
-  
+  //hvbar = (PyArrayObject *) PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
+ 
 
   //Find min and max of this and neighbour's centroid values
@@ -787 +785 @@
     for (i=0; i<3; i++) {
       n = ((long*) neighbours -> data)[k3+i];
-      ((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
+      //((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
       if (n >= 0) {
         hn = ((double*) hc -> data)[n]; //Neighbour's centroid value
@@ -799 +797 @@
   
   // Call underlying routine
-  _limit(N, beta_h, (double*) hc -> data, (double*) hvbar -> data, hmin, hmax);
+  _limit(N, beta_h, (double*) hc -> data, (double*) hv -> data, hmin, hmax);
          
   // // //Py_DECREF(domain); //FIXME: NEcessary?         
@@ -806 +804 @@
   
   //return result using PyArray to avoid memory leak  
-  return PyArray_Return(hvbar);
+  //return PyArray_Return(hvbar);
+  return Py_BuildValue("");    
 }
 

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -820 +820 @@
         
         
-    def test_inside_polygon(self):
+    def test_inside_polygon_main(self):
 
         
         #Simplest case: Polygon is the unit square
         polygon = [[0,0], [1,0], [1,1], [0,1]]
- 
-        assert inside_polygon( (0.5, 0.5), polygon )                 
+
+
+        R = inside_polygon( (0.5, 0.5), polygon)
+        print 'Inside = ', R
+        print
+        
+        R = inside_polygon( (0.5, 0.5), polygon)
+        print 'Inside = ', R
+        print
+
+        import sys; sys.exit() 
+        assert inside_polygon( (0.5, 0.5), polygon )
         assert not inside_polygon( (0.5, 1.5), polygon )   
         assert not inside_polygon( (0.5, -0.5), polygon )       
@@ -832 +842 @@
         assert not inside_polygon( (1.5, 0.5), polygon )        
         
-        #Try point on borders   
+        #Try point on borders
         assert inside_polygon( (1., 0.5), polygon, closed=True) 
         assert inside_polygon( (0.5, 1), polygon, closed=True)  
@@ -943 +953 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'test')
+    suite = unittest.makeSuite(TestCase,'test_inside_polygon_main')
     runner = unittest.TextTestRunner()
     runner.run(suite)