Changeset 7583

Timestamp:

Dec 8, 2009, 8:28:50 AM (15 years ago)

Author:

ole

Message:

Simplified version

File:

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

anuga_work/development/classroom/ripcurrent.py

@@ -12 +12 @@
 from anuga.shallow_water.shallow_water_domain import Time_boundary
 from anuga.shallow_water.data_manager import get_mesh_and_quantities_from_file
-from anuga.fit_interpolate.interpolate import Interpolation_function
 from pylab import figure, quiver, show, cos, sin, pi
 import numpy
@@ -60 +59 @@
                                                    'top' :   [2],
                                                    'left':   [3]},
-                                    maximum_triangle_area = seafloor_resolution,
-                                    mesh_filename = meshname,
-                                    interior_regions = feature_regions,
-                                    use_cache = True,
-                                    verbose = True)
+                                    maximum_triangle_area=seafloor_resolution,
+                                    mesh_filename=meshname,
+                                    interior_regions=feature_regions,
+                                    use_cache=True,
+                                    verbose=True)
                                     
 domain.set_name(filename) # Output name
@@ -179 +178 @@
 #------------------------------------------------------------------------------
 
-# Get mesh and quantities from sww file
-quantity_names = ['elevation'] + domain.conserved_quantities
+n_time_intervals = simulation_length/timestep
+print 'There were %i time steps' % n_time_intervals
 
-X = get_mesh_and_quantities_from_file(domain.get_name() + '.sww',
-                                      quantities=quantity_names,
-                                      verbose=True)
-
-mesh, quantities, timesteps = X
+U = u/n_time_intervals
+V = v/n_time_intervals
+X = gauges[:,0] 
+Y = gauges[:,1] 
 
 
-# Interpolate quantities to gauges
-I = Interpolation_function(timesteps,
-                           quantities,
-                           quantity_names=quantity_names,
-                           vertex_coordinates=mesh.nodes,
-                           triangles=mesh.triangles,
-                           interpolation_points=gauges,
-                           verbose=True)
-
-
-
-# Compute velocity field
-#uu = numpy.array(number_of_gauges)
-#vv = numpy.array(number_of_gauges)
-#for t in timesteps:
-#    for i in range(number_of_gauges):
-#        elevation, stage, uh, vh = I(t, point_id=i)#
-#
-#        depth = stage-elevation
-#        uu[i] += uh/depth
-#        vv[i] += vh/depth
-
-
-n_time_intervals = simulation_length/timestep
-u_average = u/n_time_intervals
-v_average = v/n_time_intervals
-
-print 'There were %i time steps' % n_time_intervals
-
-#print "sum y velocity", v
-print "average y velocity", v_average
-#print "sum x velocity", u
-#print "average x velocity", u_average
-
-
-X = gauges[:,0] 
-Y = gauges[:,1] 
-                              
-U = u_average #.tolist()
-V = v_average #.tolist()
-
-#print "U = ", U
-#print "U has type", type(U)
-
 print 'Computation took %.2f seconds' % (time.time()-t0)
-
 
 figure()