Changeset 8320 for trunk/anuga_work/development/mem_time_tests/triangles/serial/main.py

Timestamp:

Jan 23, 2012, 4:16:46 PM (12 years ago)

Author:

pittj

Message:

adding portability across, tornado, NCI, cyclone and compute 1 to all parrallel scripts

File:

• trunk/anuga_work/development/mem_time_tests/triangles/serial/main.py (modified) (4 diffs)

trunk/anuga_work/development/mem_time_tests/triangles/serial/main.py

@@ -15 +15 @@
 from anuga.utilities import system_tools, log
 from anuga.abstract_2d_finite_volumes.util import add_directories
+import logAnalyser
 #------------------------------------------------------------------------------
 # Setup computational domain
@@ -28 +29 @@
 file = 'ex1.csv'
 
-log.log_filename = os.path.join(scenariodir, 'log.txt')
+#log.log_filename = os.path.join(scenariodir, 'anuga.log')
 
 file_path = os.path.join(scenariodir, file)
@@ -35 +36 @@
 spamWriter = csv.writer(open(file_path, 'wb'))
 spamWriter.writerow(['Number Of Triangles' ,'Max Triangle Area', 'Extent', 'Space Used MB' , 'Time Taken s'])
+outputresource = os.path.join(scenariodir,'test.csv')
 
 
@@ -42 +44 @@
     while (n > 0):
         c = 2 #random.random() * 2000 + 1
-        system_tools.MemoryUpdate()
         z = time.time()
         h = runcairns.runex(c,r)
         y = time.time()
         n = n -1
-        x = system_tools.MemoryUpdate()[0]
-        spamWriter.writerow([h,r,(c*c),x ,(y-z)])
+        #subprocess.call(['python','timingScript.py',scenariodir,outputresource])
+        logAnalyser.AnalyseLog()
+        spamWriter.writerow([h,r,(c*c),'x' ,(y-z)])
 
 while (m > 0):