Changeset 7952


Ignore:
Timestamp:
Aug 19, 2010, 9:17:59 AM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

    r7585 r7952  
    10341034
    10351035
    1036   PyArrayObject *h, *v, *x, *xmom, *ymom;
     1036  PyArrayObject *h, *z, *x, *xmom, *ymom;
    10371037  int k, N, k3, k6;
    10381038  double g, avg_h, zx, zy;
     
    10411041
    10421042  if (!PyArg_ParseTuple(args, "dOOOOO",
    1043             &g, &h, &v, &x,
     1043            &g, &h, &z, &x,
    10441044            &xmom, &ymom)) {
    10451045    //&epsilon)) {
     
    10501050  // check that numpy array objects arrays are C contiguous memory
    10511051  CHECK_C_CONTIG(h);
    1052   CHECK_C_CONTIG(v);
     1052  CHECK_C_CONTIG(z);
    10531053  CHECK_C_CONTIG(x);
    10541054  CHECK_C_CONTIG(xmom);
     
    10601060
    10611061    // 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];
    10651065
    10661066    // Optimise for flat bed
  • trunk/anuga_core/source/anuga/structures/culvert_class.py

    r7939 r7952  
    22
    33from anuga.shallow_water.forcing import Inflow, General_forcing
    4 from anuga.culvert_flows.culvert_polygons import create_culvert_polygons
     4from anuga.structures.culvert_polygons import create_culvert_polygons
    55from anuga.utilities.system_tools import log_to_file
    66from anuga.geometry.polygon import inside_polygon, is_inside_polygon, plot_polygons
Note: See TracChangeset for help on using the changeset viewer.