Changeset 8342 for trunk/anuga_work/development/mem_time_tests/parameters/timelen-over-timestep

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/parameters/timelen-over-timestep

Files:

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

trunk/anuga_work/development/mem_time_tests/parameters/timelen-over-timestep/ex1.py

@@ -19 +19 @@
 
 
-log.timingInfo(msg=('variable1,'+str(g))) #write the variable to be measured to file
-log.timingInfo(msg=('variable2,'+str(h))) #write the variable to be measured to file
+log.timingInfo(msg=('timelength,'+str(g))) #write the variable to be measured to file
+log.timingInfo(msg=('timestep,'+str(h))) #write the variable to be measured to file
 log.timingInfo(msg=('beforetime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
 log.resource_usage_timing(prefix = 'beforesimulation') #get memory usage here
@@ -33 +33 @@
 
 log.resource_usage_timing(prefix = 'aftermesh')  #get memory usage here
+log.timingInfo(msg=('aftermeshtime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
 
 #------------------------------------------------------------------------------

trunk/anuga_work/development/mem_time_tests/parameters/timelen-over-timestep/main.py

@@ -47 +47 @@
 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"))
@@ -52 +53 @@
 indexlist.append(firstrow.index("afterboundarymemory"))
 indexlist.append(firstrow.index("aftersimulationmemory"))
-indexlist.append(firstrow.index("variable1"))
-
-#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"))
+indexlist.append(firstrow.index("timelength"))
+indexlist.append(firstrow.index("timestep"))
 
 #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])],
@@ -77 +69 @@
     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])],