Changeset 7952

Timestamp:

Aug 19, 2010, 9:17:59 AM (15 years ago)

Author:

steve

Message:

Starting to move culverts from a forcing term to a fractional step operator.
In future forcing terms should only depend on the local cell data. This is
so that the parallel version will work. It will be up to fractional step operator developers to look after their own parallel implementation.

Location:

trunk/anuga_core/source/anuga

Files:

• shallow_water/shallow_water_ext.c (modified) (4 diffs)
• structures/culvert_class.py (modified) (1 diff)

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1034 +1034 @@
 
 
-  PyArrayObject *h, *v, *x, *xmom, *ymom;
+  PyArrayObject *h, *z, *x, *xmom, *ymom;
   int k, N, k3, k6;
   double g, avg_h, zx, zy;
@@ -1041 +1041 @@
 
   if (!PyArg_ParseTuple(args, "dOOOOO",
-            &g, &h, &v, &x,
+            &g, &h, &z, &x,
             &xmom, &ymom)) {
     //&epsilon)) {
@@ -1050 +1050 @@
   // check that numpy array objects arrays are C contiguous memory
   CHECK_C_CONTIG(h);
-  CHECK_C_CONTIG(v);
+  CHECK_C_CONTIG(z);
   CHECK_C_CONTIG(x);
   CHECK_C_CONTIG(xmom);
@@ -1060 +1060 @@
 
     // Get bathymetry
-    z0 = ((double*) v -> data)[k3 + 0];
-    z1 = ((double*) v -> data)[k3 + 1];
-    z2 = ((double*) v -> data)[k3 + 2];
+    z0 = ((double*) z -> data)[k3 + 0];
+    z1 = ((double*) z -> data)[k3 + 1];
+    z2 = ((double*) z -> data)[k3 + 2];
 
     // Optimise for flat bed

trunk/anuga_core/source/anuga/structures/culvert_class.py

@@ -2 +2 @@
 
 from anuga.shallow_water.forcing import Inflow, General_forcing
-from anuga.culvert_flows.culvert_polygons import create_culvert_polygons
+from anuga.structures.culvert_polygons import create_culvert_polygons
 from anuga.utilities.system_tools import log_to_file
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, plot_polygons