Changeset 8373 for trunk/anuga_core/source/anuga/shallow_water/sw_domain.h

Timestamp:

Mar 29, 2012, 5:28:53 PM (13 years ago)

Author:

steve

Message:

changing compute_fluxes to use C domain structure

File:

• trunk/anuga_core/source/anuga/shallow_water/sw_domain.h (modified) (5 diffs)

trunk/anuga_core/source/anuga/shallow_water/sw_domain.h

@@ -15 +15 @@
     double  H0;
     double  g;
+    long    optimise_dry_cells;
+    double  flux_timestep;
 
     long*   neighbours;
@@ -22 +24 @@
     double* radii;
     double* areas;
+
     long*   tri_full_flag;
     long*   already_computed_flux;
+    double* max_speed;
 
     double* vertex_coordinates;
@@ -65 +69 @@
             *tri_full_flag,
             *already_computed_flux,
-            *vertex_coordinates;
+            *vertex_coordinates,
+            *max_speed;
 
     PyObject *quantities;
@@ -73 +78 @@
     D->H0 = get_python_double(domain, "H0");
     D->g = get_python_double(domain, "g");
+    D->optimise_dry_cells = get_python_integer(domain, "optimise_dry_cells");
+
+    D->flux_timestep = get_python_double(domain, "flux_timestep");
 
     neighbours = get_consecutive_array(domain, "neighbours");
@@ -100 +108 @@
     vertex_coordinates = get_consecutive_array(domain, "vertex_coordinates");
     D->vertex_coordinates = (double *) vertex_coordinates->data;
+    
+    max_speed = get_consecutive_array(domain, "max_speed");
+    D->max_speed = (double *) max_speed->data;
+
 
     quantities = get_python_object(domain, "quantities");