Ignore:
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
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/anuga_work/development/mem_time_tests/parameters/nothing/ex1.py

    r8336 r8342  
    1818log._setup = False
    1919
    20 log.timingInfo(msg=('variable1,'+str(n))) #write the variable to be measured to file
     20log.timingInfo(msg=('runnumber,'+str(n))) #write the variable to be measured to file
    2121log.timingInfo(msg=('beforetime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    2222log.resource_usage_timing(prefix = 'beforesimulation') #get memory usage here
    … …  
    3131
    3232log.resource_usage_timing(prefix = 'aftermesh')  #get memory usage here
     33log.timingInfo(msg=('aftermeshtime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    3334
    3435#------------------------------------------------------------------------------

  • trunk/anuga_work/development/mem_time_tests/parameters/nothing/main.py

    r8336 r8342  
    4242indexlist.append(firstrow.index("beforetime"))
    4343indexlist.append(firstrow.index("aftertime"))
     44indexlist.append(firstrow.index("aftermeshtime"))
    4445indexlist.append(firstrow.index("beforesimulationmemory"))
    4546indexlist.append(firstrow.index("aftermeshmemory"))
    … …  
    4748indexlist.append(firstrow.index("afterboundarymemory"))
    4849indexlist.append(firstrow.index("aftersimulationmemory"))
    49 indexlist.append(firstrow.index("variable1"))
    50 
    51 #not all experiments have 3 variables, but some do
    52 try:
    53     indexlist.append(firstrow.index("variable2"))
    54 except ValueError:
    55     indexlist.append(firstrow.index("beforetime"))
    56 try:
    57     indexlist.append(firstrow.index("variable3"))
    58 except ValueError:
    59     indexlist.append(firstrow.index("aftertime"))
     50indexlist.append(firstrow.index("runnumber"))
    6051
    6152#write the header for the final csv
    62 final.writerow(["TimeTaken(s)",firstrow[(indexlist[2])],
     53final.writerow(["TimeTaken(s)","MeshTime(s)",
    6354                firstrow[(indexlist[3])],firstrow[(indexlist[4])],
    6455                firstrow[(indexlist[5])],firstrow[(indexlist[6])],
    65                 firstrow[(indexlist[7])],firstrow[(indexlist[8])],
    66                 firstrow[(indexlist[9])]])
     56                firstrow[(indexlist[7])],firstrow[(indexlist[8])]])
    6757
    6858#write the data for each column in the final csv
    … …  
    7262    begin = time.strptime(row[(indexlist[0])],'%Y%m%d_%H%M%S')
    7363    end = time.strptime(row[(indexlist[1])],'%Y%m%d_%H%M%S')
     64    mesh = time.strptime(row[(indexlist[2])],'%Y%m%d_%H%M%S')
    7465    taken = time.mktime(end) - time.mktime(begin)
     66    meshtime = time.mktime(mesh) - time.mktime(begin)
    7567
    7668    #write to file
    77     final.writerow([str(taken),row[(indexlist[2])],
     69    final.writerow([str(taken),str(meshtime),
    7870                    row[(indexlist[3])],row[(indexlist[4])],
    7971                    row[(indexlist[5])],row[(indexlist[6])],
    80                     row[(indexlist[7])],row[(indexlist[8])],
    81                     row[(indexlist[9])]])
     72                    row[(indexlist[7])],row[(indexlist[8])]])
    8273

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

    r8336 r8342  
    1919
    2020
    21 log.timingInfo(msg=('variable1,'+str(g))) #write the variable to be measured to file
    22 log.timingInfo(msg=('variable2,'+str(h))) #write the variable to be measured to file
     21log.timingInfo(msg=('timelength,'+str(g))) #write the variable to be measured to file
     22log.timingInfo(msg=('timestep,'+str(h))) #write the variable to be measured to file
    2323log.timingInfo(msg=('beforetime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    2424log.resource_usage_timing(prefix = 'beforesimulation') #get memory usage here
    … …  
    3333
    3434log.resource_usage_timing(prefix = 'aftermesh')  #get memory usage here
     35log.timingInfo(msg=('aftermeshtime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    3536
    3637#------------------------------------------------------------------------------

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

    r8336 r8342  
    4747indexlist.append(firstrow.index("beforetime"))
    4848indexlist.append(firstrow.index("aftertime"))
     49indexlist.append(firstrow.index("aftermeshtime"))
    4950indexlist.append(firstrow.index("beforesimulationmemory"))
    5051indexlist.append(firstrow.index("aftermeshmemory"))
    … …  
    5253indexlist.append(firstrow.index("afterboundarymemory"))
    5354indexlist.append(firstrow.index("aftersimulationmemory"))
    54 indexlist.append(firstrow.index("variable1"))
    55 
    56 #not all experiments have 3 variables, but some do
    57 try:
    58     indexlist.append(firstrow.index("variable2"))
    59 except ValueError:
    60     indexlist.append(firstrow.index("beforetime"))
    61 try:
    62     indexlist.append(firstrow.index("variable3"))
    63 except ValueError:
    64     indexlist.append(firstrow.index("aftertime"))
     55indexlist.append(firstrow.index("timelength"))
     56indexlist.append(firstrow.index("timestep"))
    6557
    6658#write the header for the final csv
    67 final.writerow(["TimeTaken(s)",firstrow[(indexlist[2])],
     59final.writerow(["TimeTaken(s)","MeshTime(s)",
    6860                firstrow[(indexlist[3])],firstrow[(indexlist[4])],
    6961                firstrow[(indexlist[5])],firstrow[(indexlist[6])],
    … …  
    7769    begin = time.strptime(row[(indexlist[0])],'%Y%m%d_%H%M%S')
    7870    end = time.strptime(row[(indexlist[1])],'%Y%m%d_%H%M%S')
     71    mesh = time.strptime(row[(indexlist[2])],'%Y%m%d_%H%M%S')
    7972    taken = time.mktime(end) - time.mktime(begin)
     73    meshtime = time.mktime(mesh) - time.mktime(begin)
    8074
    8175    #write to file
    82     final.writerow([str(taken),row[(indexlist[2])],
     76    final.writerow([str(taken),str(meshtime),
    8377                    row[(indexlist[3])],row[(indexlist[4])],
    8478                    row[(indexlist[5])],row[(indexlist[6])],

  • trunk/anuga_work/development/mem_time_tests/parameters/timelen/ex1.py

    r8336 r8342  
    1818log._setup = False
    1919
    20 log.timingInfo(msg=('variable1,'+str(f))) #write the variable to be measured to file
    21 
     20log.timingInfo(msg=('timelength,'+str(f))) #write the variable to be measured to file
     21log.timingInfo(msg=('timestep,'+str(g))) #write the variable to be measured to file
    2222log.timingInfo(msg=('beforetime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    23 
    2423log.resource_usage_timing(prefix = 'beforesimulation') #get memory usage here
    2524
    … …  
    3332
    3433log.resource_usage_timing(prefix = 'aftermesh') #get memory usage here
     34log.timingInfo(msg=('aftermeshtime,'+str(log.TimeStamp()))) #get the time at the beginning of the simulation
    3535#------------------------------------------------------------------------------
    3636# Setup initial conditions

  • trunk/anuga_work/development/mem_time_tests/parameters/timelen/main.py

    r8336 r8342  
    4444indexlist.append(firstrow.index("beforetime"))
    4545indexlist.append(firstrow.index("aftertime"))
     46indexlist.append(firstrow.index("aftermeshtime"))
    4647indexlist.append(firstrow.index("beforesimulationmemory"))
    4748indexlist.append(firstrow.index("aftermeshmemory"))
    … …  
    4950indexlist.append(firstrow.index("afterboundarymemory"))
    5051indexlist.append(firstrow.index("aftersimulationmemory"))
    51 indexlist.append(firstrow.index("variable1"))
     52indexlist.append(firstrow.index("timelength"))
     53indexlist.append(firstrow.index("timestep"))
    5254
    53 #not all experiments have 3 variables, but some do
    54 try:
    55     indexlist.append(firstrow.index("variable2"))
    56 except ValueError:
    57     indexlist.append(firstrow.index("beforetime"))
    58 try:
    59     indexlist.append(firstrow.index("variable3"))
    60 except ValueError:
    61     indexlist.append(firstrow.index("aftertime"))
    6255
    6356#write the header for the final csv
    64 final.writerow(["TimeTaken(s)",firstrow[(indexlist[2])],
     57final.writerow(["TimeTaken(s)",'MeshTime(s)',
    6558                firstrow[(indexlist[3])],firstrow[(indexlist[4])],
    6659                firstrow[(indexlist[5])],firstrow[(indexlist[6])],
    … …  
    7467    begin = time.strptime(row[(indexlist[0])],'%Y%m%d_%H%M%S')
    7568    end = time.strptime(row[(indexlist[1])],'%Y%m%d_%H%M%S')
     69    mesh = time.strptime(row[(indexlist[2])],'%Y%m%d_%H%M%S')
    7670    taken = time.mktime(end) - time.mktime(begin)
     71    meshtime = time.mktime(mesh) - time.mktime(begin)
    7772
    7873    #write to file
    79     final.writerow([str(taken),row[(indexlist[2])],
     74    final.writerow([str(taken),str(meshtime),
    8075                    row[(indexlist[3])],row[(indexlist[4])],
    8176                    row[(indexlist[5])],row[(indexlist[6])],
Note: See TracChangeset for help on using the changeset viewer.