Changeset 8342 for trunk/anuga_work/development/mem_time_tests/scenarios/vel2

Timestamp:

Feb 15, 2012, 3:58:52 PM (13 years ago)

Author:

pittj

Message:

all variables now have the correct name

Location:

trunk/anuga_work/development/mem_time_tests/scenarios/vel2

Files:

• ex1.py (modified) (3 diffs)
• main.py (modified) (3 diffs)

trunk/anuga_work/development/mem_time_tests/scenarios/vel2/ex1.py

@@ -11 +11 @@
 #set up variables for the simulation output and the log files
 k= sys.argv[1]
-l= sys.argv[2]
+l= float(sys.argv[2])
 
 home = os.getenv('INUNDATIONHOME')
@@ -17 +17 @@
                                        "velocity", "velocity-" + str(k) +"-"+ str(l)])
 
-log.timingInfo(msg=('variable1,'+str(k))) #write the variable to be measured to file
-log.timingInfo(msg=('variable2,'+str(l))) #write the variable to be measured to file
+log.timingInfo(msg=('velocity,'+str(k))) #write the variable to be measured to file
+log.timingInfo(msg=('extent,'+str(l**2))) #write the variable to be measured to file
 log.timingInfo(msg=('beforetime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
 
@@ -34 +34 @@
 
 log.resource_usage_timing(prefix = 'aftermesh')  #get memory usage 
+log.timingInfo(msg=('aftermeshtime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
 
 #get the number of triangles
 number = len(domain)
-log.timingInfo(msg=('variable3,'+str(number))) #write the variable to be measured to file
+log.timingInfo(msg=('numberoftriangles'+str(number))) #write the variable to be measured to file
 
 #--------------------------------------------------------------------------

trunk/anuga_work/development/mem_time_tests/scenarios/vel2/main.py

@@ -43 +43 @@
 indexlist.append(firstrow.index("beforetime"))
 indexlist.append(firstrow.index("aftertime"))
+indexlist.append(firstrow.index("aftermeshtime"))
 indexlist.append(firstrow.index("beforesimulationmemory"))
 indexlist.append(firstrow.index("aftermeshmemory"))
@@ -48 +49 @@
 indexlist.append(firstrow.index("afterboundarymemory"))
 indexlist.append(firstrow.index("aftersimulationmemory"))
-indexlist.append(firstrow.index("variable1"))
+indexlist.append(firstrow.index("velocity"))
+indexlist.append(firstrow.index("extent"))
+indexlist.append(firstrow.index("numberoftriangles"))
 
-#not all experiments have 3 variables, but some do
-try:
-    indexlist.append(firstrow.index("variable2"))
-except ValueError:
-    indexlist.append(firstrow.index("beforetime"))
-try:
-    indexlist.append(firstrow.index("variable3"))
-except ValueError:
-    indexlist.append(firstrow.index("aftertime"))
 
 #write the header for the final csv
-final.writerow(["TimeTaken(s)",firstrow[(indexlist[2])],
+final.writerow(["TimeTaken(s)","MeshTime(s)",
                 firstrow[(indexlist[3])],firstrow[(indexlist[4])],
                 firstrow[(indexlist[5])],firstrow[(indexlist[6])],
                 firstrow[(indexlist[7])],firstrow[(indexlist[8])],
-                firstrow[(indexlist[9])]])
+                firstrow[(indexlist[9])],firstrow[(indexlist[10])]])
 
 #write the data for each column in the final csv
@@ -73 +67 @@
     begin = time.strptime(row[(indexlist[0])],'%Y%m%d_%H%M%S')
     end = time.strptime(row[(indexlist[1])],'%Y%m%d_%H%M%S')
+    mesh = time.strptime(row[(indexlist[2])],'%Y%m%d_%H%M%S')
     taken = time.mktime(end) - time.mktime(begin)
+    meshtime = time.mktime(mesh) - time.mktime(begin)
 
     #write to file
-    final.writerow([str(taken),row[(indexlist[2])],
+    final.writerow([str(taken),str(meshtime),
                     row[(indexlist[3])],row[(indexlist[4])],
                     row[(indexlist[5])],row[(indexlist[6])],
                     row[(indexlist[7])],row[(indexlist[8])],
-                    row[(indexlist[9])]])
+                    row[(indexlist[9])],row[(indexlist[10])]])