Changeset 7924 for trunk

Timestamp:

Aug 5, 2010, 8:32:33 PM (15 years ago)

Author:

mungkasi

Message:

 

Location:

trunk/anuga_work/development/sudi/sw_1d/periodic_waves

Files:

• cg/run-program.py (modified) (4 diffs)
• johns/run-program.py (modified) (4 diffs)

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/run-program.py

@@ -297 +297 @@
 
     
-    from pylab import clf,plot,title,xlabel,ylabel,legend,savefig,show,hold,subplot,ion
+    from pylab import clf,plot,title,xlabel,ylabel,legend,show,hold,subplot,ion#,savefig
     hold(False)
     clf()
 
     plot1 = subplot(311)
-    plot(Ver/1e+4,AnalitW_V,'b-',  Ver/1e+4,StageV,'g-',  Ver/1e+4,ElevationV,'k-')
+    plot(Ver.flat/1e+4,AnalitW_V.flat,'b-',  Ver.flat/1e+4,StageV.flat,'g-',  Ver.flat/1e+4,ElevationV.flat,'k-')
     #plot(Ver,StageV, Ver,ElevationV)
     #plot(Ver/L,StageV/h_0,  Ver/L,ElevationV/h_0)
@@ -313 +313 @@
     
     plot2 = subplot(312)
-    plot(Ver/1e+4,AnalitP_V,'b-',  Ver/1e+4,MomV,'g-')
+    plot(Ver.flat/1e+4,AnalitP_V.flat,'b-',  Ver.flat/1e+4,MomV.flat,'g-')
     #plot(Ver/L, VelV/sqrt(g*h_0))
     #xlabel('Position')
@@ -322 +322 @@
 
     plot3 = subplot(313)
-    plot(Ver/1e+4,AnalitU_V,'b-',  Ver/1e+4,VelV,'g-')
+    plot(Ver.flat/1e+4,AnalitU_V.flat,'b-',  Ver.flat/1e+4,VelV.flat,'g-')
     #plot(Ver/L, VelV/sqrt(g*h_0))
     xlabel('Position / 10,000')
@@ -332 +332 @@
     #filename = "%s%04i%s%f%s" %("numerical_cg_", counter,"_", domain.time, ".png")
     #savefig(filename)
-    #show()
+    show()
     #raw_input("Press ENTER to continue")
     

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/johns/run-program.py

@@ -299 +299 @@
 
     #put this
-    from pylab import clf,plot,title,xlabel,ylabel,legend,savefig,show,hold,subplot,ion
+    from pylab import clf,plot,title,xlabel,ylabel,legend,show,hold,subplot,ion#,savefig
     hold(False)
     clf()
 
     plot1 = subplot(311)
-    plot(Ver/1e+4,AnalitW_V,'b-',  Ver/1e+4,StageV,'g-',  Ver/1e+4,ElevationV,'k-')
+    plot(Ver.flat/1e+4,AnalitW_V.flat,'b-',  Ver.flat/1e+4,StageV.flat,'g-',  Ver.flat/1e+4,ElevationV.flat,'k-')
     #plot(Ver,StageV, Ver,ElevationV)
     #plot(Ver/L,StageV/h_0,  Ver/L,ElevationV/h_0)
@@ -315 +315 @@
     
     plot2 = subplot(312)
-    plot(Ver/1e+4,AnalitP_V,'b-',  Ver/1e+4,MomV,'g-')
+    plot(Ver.flat/1e+4,AnalitP_V.flat,'b-',  Ver.flat/1e+4,MomV.flat,'g-')
     #plot(Ver/L, VelV/sqrt(g*h_0))
     #xlabel('Position')
@@ -324 +324 @@
 
     plot3 = subplot(313)
-    plot(Ver/1e+4,AnalitU_V,'b-',  Ver/1e+4,VelV,'g-')
+    plot(Ver.flat/1e+4,AnalitU_V.flat,'b-',  Ver.flat/1e+4,VelV.flat,'g-')
     #plot(Ver/L, VelV/sqrt(g*h_0))
     xlabel('Position / 10,000')
@@ -332 +332 @@
            'upper center', shadow=False)
     
-    filename = "%s%04i%s%f%s" %("numerical_johns_", counter,"_", domain.time, ".png")
-    savefig(filename)
-    #show()
+    #filename = "%s%04i%s%f%s" %("numerical_johns_", counter,"_", domain.time, ".png")
+    #savefig(filename)
+    show()
     #raw_input("Press ENTER to continue")
-    #put this
     counter = counter+1
     finaltime = finaltime + waktu