Changeset 990

Timestamp:

Mar 2, 2005, 5:53:41 PM (20 years ago)

Author:

steve

Message:

Put back to old version, will get unit test working before committing again

File:

• inundation/ga/storm_surge/pyvolution/shallow_water_ext.c (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -625 +625 @@
       //Update timestep
       //timestep = min(timestep, domain.radii[k]/max_speed)
+      //FIXME: SR Add parameter for CFL condition
       if (max_speed > epsilon) {
-        timestep = min(timestep, 0.5*((double *) radii -> data)[k]/max_speed);
+        timestep = min(timestep, ((double *) radii -> data)[k]/max_speed);
       }   
     } // end for i
@@ -780 +781 @@
     for (i=0; i<3; i++) {
       n = ((long*) neighbours -> data)[k3+i];
-      ((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
+      // FIXME SR This line should be included to ensure conservation, 
+      // but the unit tests give errors at the moment!
+      //((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
       if (n >= 0) {
         hn = ((double*) hc -> data)[n]; //Neighbour's centroid value