Changeset 6713

Timestamp:

Apr 3, 2009, 12:34:47 PM (16 years ago)

Author:

steve

Message:

Fixed pylab so that it would work on bogong, by flattening the arrays for plotting

Location:

anuga_work/development/anuga_1d

Files:

• discontinuous_z.py (modified) (3 diffs)
• test_discontinuous_z.py (modified) (4 diffs)
• var_depth_only.py (modified) (1 diff)

anuga_work/development/anuga_1d/discontinuous_z.py

@@ -19 +19 @@
 domain.set_timestepping_method('rk2')
 domain.cfl = 1.0
-domain.limiter = "minmod"
+domain.limiter = "vanleer"
 
 def stage_flat(x):
@@ -85 +85 @@
 domain.set_quantity('elevation',elevation_arbitrary)
 domain.set_boundary({'exterior':Reflective_boundary(domain)})
-X=domain.vertices
-C=domain.centroids
+X=domain.vertices.flat
+C=domain.centroids.flat
 
 t0=time.time()
@@ -95 +95 @@
         print "t=",t
         print "integral", domain.quantities['height'].get_integral()
-        StageQ=domain.quantities['stage'].vertex_values
-        MomentumQ=domain.quantities['xmomentum'].vertex_values
-        ElevationQ=domain.quantities['elevation'].vertex_values
-        VelocityQ=domain.quantities['velocity'].vertex_values
+        StageQ=domain.quantities['stage'].vertex_values.flat
+        MomentumQ=domain.quantities['xmomentum'].vertex_values.flat
+        ElevationQ=domain.quantities['elevation'].vertex_values.flat
+        VelocityQ=domain.quantities['velocity'].vertex_values.flat
 
         hold(False)

anuga_work/development/anuga_1d/test_discontinuous_z.py

@@ -85 +85 @@
 domain.set_quantity('elevation',elevation_arbitrary2)
 domain.set_boundary({'exterior':Reflective_boundary(domain)})
-X=domain.vertices
-C=domain.centroids
+X=domain.vertices.flat
+C=domain.centroids.flat
 
 yieldstep = 1.0
@@ -148 +148 @@
 domain.write_time()
 print "integral", domain.quantities['height'].get_integral()
-StageQ=domain.quantities['stage'].vertex_values
+StageQ=domain.quantities['stage'].vertex_values.flat
 StageUp=domain.quantities['stage'].explicit_update
-MomentumQ=domain.quantities['xmomentum'].vertex_values
+MomentumQ=domain.quantities['xmomentum'].vertex_values.flat
 MomentumUp=domain.quantities['xmomentum'].explicit_update
 
-ElevationQ=domain.quantities['elevation'].vertex_values
-VelocityQ=domain.quantities['velocity'].vertex_values
+ElevationQ=domain.quantities['elevation'].vertex_values.flat
+VelocityQ=domain.quantities['velocity'].vertex_values.flat
 
 print "momentum", MomentumQ
@@ -161 +161 @@
 #StageUp=domain.quantities['stage'].explicit_update
 print "MomUpdates", MomentumUp
+
 hold(False)
 plot1 = subplot(311)
+#plot(X,StageQ)
 plot(X,StageQ, X,ElevationQ)
 plot1.set_ylim([-1.0,8.0])
@@ -178 +180 @@
 plot3 = subplot(313)
 plot(X,VelocityQ)
-#plot2.set_ylim([-5.0,30.0])
+#plot3.set_ylim([-5.0,30.0])
 legend( ('Numerical Solution', 'for velocity'), 'upper right', shadow=False)
 xlabel('Position')

anuga_work/development/anuga_1d/var_depth_only.py

@@ -63 +63 @@
 
 # Define random array for width
-
+
 randomarray=zeros(len(points),Float)
 for j in range(N+1):