Changeset 3021 for inundation/pyvolution/shallow_water_ext.c

Timestamp:

May 30, 2006, 4:17:18 PM (19 years ago)

Author:

steve

Message:

updated timestep using only full cells

File:

• inundation/pyvolution/shallow_water_ext.c (modified) (4 diffs)

inundation/pyvolution/shallow_water_ext.c

@@ -980 +980 @@
   PyArrayObject *neighbours, *neighbour_edges,
     *normals, *edgelengths, *radii, *areas,
+    *tri_full_flag,
     *stage_edge_values,
     *xmom_edge_values,
@@ -1004 +1005 @@
 
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "dddOOOOOOOOOOOOOOOOO",
+  if (!PyArg_ParseTuple(args, "dddOOOOOOOOOOOOOOOOOO",
                         &timestep,
                         &epsilon,
@@ -1012 +1013 @@
                         &normals,
                         &edgelengths, &radii, &areas,
+            &tri_full_flag,
                         &stage_edge_values,
                         &xmom_edge_values,
@@ -1090 +1092 @@
         //timestep = min(timestep, domain.radii[k]/max_speed)
         //FIXME: SR Add parameter for CFL condition
-        if (max_speed > epsilon) {
-          timestep = min(timestep, ((double *) radii -> data)[k]/max_speed);
-          //maxspeed in flux_function is calculated as max(|u+a|,|u-a|)
-          if (n>=0)
-            timestep = min(timestep, ((double *) radii -> data)[n]/max_speed);
-        }
+    if ( ((long *) tri_full_flag -> data)[k] == 1) {
+            if (max_speed > epsilon) {
+                timestep = min(timestep, ((double *) radii -> data)[k]/max_speed);
+                //maxspeed in flux_function is calculated as max(|u+a|,|u-a|)
+                if (n>=0)
+                    timestep = min(timestep, ((double *) radii -> data)[n]/max_speed);
+            }
+    }
     } // end for i
     //Normalise by area and store for when all conserved