Changeset 7952
 Timestamp:
 Aug 19, 2010, 9:17:59 AM (14 years ago)
 Location:
 trunk/anuga_core/source/anuga
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c
r7585 r7952 1034 1034 1035 1035 1036 PyArrayObject *h, * v, *x, *xmom, *ymom;1036 PyArrayObject *h, *z, *x, *xmom, *ymom; 1037 1037 int k, N, k3, k6; 1038 1038 double g, avg_h, zx, zy; … … 1041 1041 1042 1042 if (!PyArg_ParseTuple(args, "dOOOOO", 1043 &g, &h, & v, &x,1043 &g, &h, &z, &x, 1044 1044 &xmom, &ymom)) { 1045 1045 //&epsilon)) { … … 1050 1050 // check that numpy array objects arrays are C contiguous memory 1051 1051 CHECK_C_CONTIG(h); 1052 CHECK_C_CONTIG( v);1052 CHECK_C_CONTIG(z); 1053 1053 CHECK_C_CONTIG(x); 1054 1054 CHECK_C_CONTIG(xmom); … … 1060 1060 1061 1061 // Get bathymetry 1062 z0 = ((double*) v> data)[k3 + 0];1063 z1 = ((double*) v> data)[k3 + 1];1064 z2 = ((double*) v> data)[k3 + 2];1062 z0 = ((double*) z > data)[k3 + 0]; 1063 z1 = ((double*) z > data)[k3 + 1]; 1064 z2 = ((double*) z > data)[k3 + 2]; 1065 1065 1066 1066 // Optimise for flat bed 
trunk/anuga_core/source/anuga/structures/culvert_class.py
r7939 r7952 2 2 3 3 from anuga.shallow_water.forcing import Inflow, General_forcing 4 from anuga. culvert_flows.culvert_polygons import create_culvert_polygons4 from anuga.structures.culvert_polygons import create_culvert_polygons 5 5 from anuga.utilities.system_tools import log_to_file 6 6 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, plot_polygons
Note: See TracChangeset
for help on using the changeset viewer.