Changeset 2676

Timestamp:

Apr 6, 2006, 11:03:04 PM (18 years ago)

Author:

steve

Message:

 

Location:

inundation/pyvolution

Files:

• quantity.py (modified) (3 diffs)
• quantity_ext.c (modified) (1 diff)

inundation/pyvolution/quantity.py

@@ -1110 +1110 @@
     """
 
-    from Numeric import sum, equal, ones, Float
+    from Numeric import sum, equal, ones, exp, Float
 
     N = quantity.centroid_values.shape[0]
@@ -1126 +1126 @@
             quantity.semi_implicit_update[k] /= x
 
-    #Explicit updates
-    quantity.centroid_values += timestep*quantity.explicit_update
 
     #Semi implicit updates
@@ -1143 +1141 @@
         quantity.centroid_values /= denominator
 
+#    quantity.centroid_values = exp(timestep*quantity.semi_implicit_update)*quantity.centroid_values
+
+    #Explicit updates
+    quantity.centroid_values += timestep*quantity.explicit_update
 
 def interpolate_from_vertices_to_edges(quantity):

inundation/pyvolution/quantity_ext.c

@@ -197 +197 @@
     }
   }
+
+/*  for (k=0; k<N; k++) {*/
+/*    centroid_values[k] = exp(timestep*semi_implicit_update[k])*centroid_values[k];*/
+/*  }*/