Changeset 7589

Timestamp:

Dec 10, 2009, 12:29:22 PM (14 years ago)

Author:

ole

Message:

Removed interpolation and brought run time down from 20+ seconds to < 1 second

File:

• anuga_work/development/classroom/ripcurrent.py (modified) (2 diffs)

anuga_work/development/classroom/ripcurrent.py

@@ -175 +175 @@
 #------------------------------------------------------------------------------
 
-# Read in gauge locations for interpolation and convert them to floats
-gauge_file = open('New_gauges.csv', 'r')
-G = [(float(x[0]), float(x[1])) for x in csv.reader(gauge_file,
-                                                    dialect='excel', 
-                                                    delimiter=',')]
-gauges = numpy.array(G)
-number_of_gauges = len(gauges)
-
 # Allocate space for velocity values
-u = numpy.zeros(number_of_gauges)
-v = numpy.zeros(number_of_gauges)
+u = numpy.zeros(len(domain))
+v = numpy.zeros(len(domain))
 
 t0 = time.time()
 for t in domain.evolve(yieldstep = timestep, finaltime = simulation_length):
     print domain.timestepping_statistics()
-    S = domain.get_quantity('stage').get_values(interpolation_points=gauges)
-    E = domain.get_quantity('elevation').get_values(interpolation_points=gauges)
+    
+    S = domain.get_quantity('stage').get_values(location='centroids')
+    E = domain.get_quantity('elevation').get_values(location='centroids')
     depth = S-E
 
-    uh = domain.get_quantity('xmomentum').get_values(interpolation_points=gauges)
-    vh = domain.get_quantity('ymomentum').get_values(interpolation_points=gauges)
+    uh = domain.get_quantity('xmomentum').get_values(location='centroids')
+    vh = domain.get_quantity('ymomentum').get_values(location='centroids')
     u += uh/depth
     v += vh/depth
@@ -207 +200 @@
 print 'There were %i time steps' % n_time_intervals
 
+nodes = domain.get_nodes()
+
+X = nodes[:,0]
+Y = nodes[:,1]
 U = u/n_time_intervals
 V = v/n_time_intervals
-X = gauges[:,0] 
-Y = gauges[:,1] 
-
 
 print 'Computation took %.2f seconds' % (time.time()-t0)