Changeset 6410 for branches/numpy/anuga/shallow_water/shallow_water_ext.c
 Timestamp:
 Feb 25, 2009, 9:37:22 AM (15 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

branches/numpy/anuga/shallow_water/shallow_water_ext.c
r6304 r6410 879 879 } 880 880 881 // check that numpy array objects arrays are C contiguous memory 882 CHECK_C_CONTIG(h); 883 CHECK_C_CONTIG(v); 884 CHECK_C_CONTIG(x); 885 CHECK_C_CONTIG(xmom); 886 CHECK_C_CONTIG(ymom); 887 881 888 N = h > dimensions[0]; 882 889 for (k=0; k<N; k++) { … … 937 944 } 938 945 946 // check that numpy array objects arrays are C contiguous memory 947 CHECK_C_CONTIG(w); 948 CHECK_C_CONTIG(z); 949 CHECK_C_CONTIG(uh); 950 CHECK_C_CONTIG(vh); 951 CHECK_C_CONTIG(eta); 952 CHECK_C_CONTIG(xmom); 953 CHECK_C_CONTIG(ymom); 939 954 940 955 N = w > dimensions[0]; … … 967 982 &xmom, &ymom)) 968 983 return NULL; 984 985 // check that numpy array objects arrays are C contiguous memory 986 CHECK_C_CONTIG(w); 987 CHECK_C_CONTIG(z); 988 CHECK_C_CONTIG(uh); 989 CHECK_C_CONTIG(vh); 990 CHECK_C_CONTIG(eta); 991 CHECK_C_CONTIG(xmom); 992 CHECK_C_CONTIG(ymom); 969 993 970 994 N = w > dimensions[0]; … … 1499 1523 } 1500 1524 1525 // check that numpy array objects arrays are C contiguous memory 1526 CHECK_C_CONTIG(surrogate_neighbours); 1527 CHECK_C_CONTIG(number_of_boundaries); 1528 CHECK_C_CONTIG(centroid_coordinates); 1529 CHECK_C_CONTIG(stage_centroid_values); 1530 CHECK_C_CONTIG(xmom_centroid_values); 1531 CHECK_C_CONTIG(ymom_centroid_values); 1532 CHECK_C_CONTIG(elevation_centroid_values); 1533 CHECK_C_CONTIG(vertex_coordinates); 1534 CHECK_C_CONTIG(stage_vertex_values); 1535 CHECK_C_CONTIG(xmom_vertex_values); 1536 CHECK_C_CONTIG(ymom_vertex_values); 1537 CHECK_C_CONTIG(elevation_vertex_values); 1538 1501 1539 // Get the safety factor beta_w, set in the config.py file. 1502 1540 // This is used in the limiting process … … 2052 2090 } 2053 2091 2054 2092 // check that numpy array objects arrays are C contiguous memory 2093 CHECK_C_CONTIG(neighbours); 2094 CHECK_C_CONTIG(neighbour_edges); 2095 CHECK_C_CONTIG(normals); 2096 CHECK_C_CONTIG(edgelengths); 2097 CHECK_C_CONTIG(radii); 2098 CHECK_C_CONTIG(areas); 2099 CHECK_C_CONTIG(tri_full_flag); 2100 CHECK_C_CONTIG(stage_edge_values); 2101 CHECK_C_CONTIG(xmom_edge_values); 2102 CHECK_C_CONTIG(ymom_edge_values); 2103 CHECK_C_CONTIG(bed_edge_values); 2104 CHECK_C_CONTIG(stage_boundary_values); 2105 CHECK_C_CONTIG(xmom_boundary_values); 2106 CHECK_C_CONTIG(ymom_boundary_values); 2107 CHECK_C_CONTIG(stage_explicit_update); 2108 CHECK_C_CONTIG(xmom_explicit_update); 2109 CHECK_C_CONTIG(ymom_explicit_update); 2110 CHECK_C_CONTIG(already_computed_flux); 2111 CHECK_C_CONTIG(max_speed_array); 2112 2055 2113 int number_of_elements = stage_edge_values > dimensions[0]; 2056 2114
Note: See TracChangeset
for help on using the changeset viewer.