Changeset 7581

Timestamp:

Dec 7, 2009, 9:27:44 PM (15 years ago)

Author:

ole

Message:

Further simplifications

File:

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

anuga_work/development/classroom/ripcurrent.py

@@ -1 @@
-"""Simple water flow example using ANUGA
+"""ANUGA simulation of simple rip current.
+
+Source: Reference to paper in here
 """
 
@@ -18 +20 @@
 # Parameters
 #------------------------------------------------------------------------------
+
 filename = "WORKING-RIP-LAB_Expt-Geometry_Triangular_Mesh"
+
 location_of_shore = 140 # The position along the y axis of the shorefront
 sandbar = 1.2           # Height of sandbar
@@ -60 +64 @@
                                     verbose = True)
                                     
-domain.set_name(filename)                  # Output name
+domain.set_name(filename) # Output name
 print domain.statistics()
 
@@ -71 +75 @@
 
     # General slope and buildings
-    z=0.05*(y-(location_of_shore))
+    z=0.05*(y-location_of_shore)
     
     N = len(x)
     for i in range(N):
         if y[i] < 25:
-            z[i] = (0.2*(y[i]-25)) + 0.05*(y[i]-(location_of_shore))
+            z[i] = 0.2*(y[i]-25) + 0.05*(y[i]-location_of_shore)
     for i in range(N):
         if y[i]>150:
-            z[i] = (0.1*(y[i]-150)) + 0.05*(y[i]-(location_of_shore))
+            z[i] = 0.1*(y[i]-150) + 0.05*(y[i]-location_of_shore)
 
     return z
@@ -91 +95 @@
     # It would be great with a comment about what this does
     for i in range(N):
-        ymin = -1*(bank_slope)*x[i] + 112 
-        ymax = -1*(bank_slope)*x[i] + 124
+        ymin = -bank_slope*x[i] + 112 
+        ymax = -bank_slope*x[i] + 124
         xmin = 0
-        xmax = (length/2)-halfchannelwidth
+        xmax = length/2-halfchannelwidth
         if ymin < y[i] < ymax and xmin < x[i]< xmax:
-            z[i] += sandbar*((cos((y[i]-118)/steepness)))
+            z[i] += sandbar*cos((y[i]-118)/steepness)
     
     # It would be great with a comment about what this does        
     for i in range(N):
-        ymin = -1*(bank_slope)*(x[i]-(length/2)) + (-1*(bank_slope)*(length/2)+112)
-        ymax = -1*(bank_slope)*(x[i]-(length/2)) + (-1*(bank_slope)*(length/2)+124)
-        xmin = (length/2)+halfchannelwidth
+        ymin = -bank_slope*(x[i]-length/2) - bank_slope*length/2 + 112
+        ymax = -bank_slope*(x[i]-length/2) - bank_slope*length/2 + 124
+        xmin = length/2+halfchannelwidth
         xmax = 183
         if ymin < y[i] < ymax and xmin < x[i] < xmax:
-            z[i] += sandbar*(cos((y[i]-118)/steepness))
+            z[i] += sandbar*cos((y[i]-118)/steepness)
             
     return z
@@ -151 +155 @@
 gauges = numpy.array(G)
 number_of_gauges = len(gauges)
-print gauges                               
 
 # Allocate space for velocity values
@@ -168 +171 @@
     u += uh/depth
     v += vh/depth
-print 'Evolution took %.2f seconds' % (time.time()-t0)
 
     
@@ -215 +217 @@
 v_average = v/n_time_intervals
 
-#print "there were", n_time_intervals, "time steps"
+print 'There were %i time steps' % n_time_intervals
 
 #print "sum y velocity", v
-#print "average y velocity", v_average
+print "average y velocity", v_average
 #print "sum x velocity", u
 #print "average x velocity", u_average
-
-x_output = file('x_velocity.txt', 'w')
-y_output = file('y_velocity.txt', 'w')
-
-#print >> x_output, " "
-#print >> y_output, " "
-
-#print >> x_output, u_average
-#print >> y_output, v_average
 
 
@@ -235 +228 @@
 Y = gauges[:,1] 
                               
-U = u_average.tolist()
-V = v_average.tolist()
+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)