Changeset 8310

Timestamp:

Jan 19, 2012, 1:05:43 PM (12 years ago)

Author:

pittj

Message:

again updating the resource experiment python scripts

Location:

trunk/anuga_work/development/mem_time_tests/triangles/area

Files:

• main.py (modified) (5 diffs)
• runcairns.py (modified) (4 diffs)

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

@@ -11 +11 @@
 import os
 import time
+import liststore
 from anuga.utilities import system_tools, log
 from anuga.abstract_2d_finite_volumes.util import add_directories
@@ -21 +22 @@
 #SpaceUsed = 0.0
 #number = 0
-spacelist = [0,0,0,0]
 
-home = os.getenv('INUNDATIONHOME')
-scenariodir = add_directories(home, ["data","mem_time_test", "triangles","area"])
-file = 'ex1.csv'
-file_path = os.path.join(scenariodir, file)
+home1 = os.getenv('INUNDATIONHOME')
+scenariodir = add_directories(home1, ["data","mem_time_test", "triangles","area"])
+file1 = 'ex1.csv'
+file_path = os.path.join(scenariodir, file1)
 storel ='storel.txt'
 file_path_storel = os.path.join(scenariodir, storel)
@@ -36 +36 @@
 file_path_storen = os.path.join(scenariodir, storen)
 
+log.log_filename = os.path.join(scenariodir, 'log.txt')
+
 spamWriter = csv.writer(open(file_path, 'wb'))
 spamWriter.writerow(['Number Of Triangles' ,'Max Triangle Area', 'Extent', 'Space Used MB' , 'Time Taken s'])
@@ -42 +44 @@
 def rum(d):
      f = 4
-     for l in range(1,2000,100):
+     for l in range(100,2000,100):
         
         g = open(file_path_storel,'r+')
@@ -51 +53 @@
 
         z = time.time()
-        subprocess.call(['mpirun', '-np', str(f), '-hostfile' ,'~/machinefiles/t.machines_tornado', '-x', 'PYTHONPATH','python2.5', 'runcairns.py']) 
+        subprocess.call(['mpirun', '-np', str(f), '-hostfile' ,'~/machinefiles/t.machines_tornado', '-x','PYTHONPATH','-x','INUNDATIONHOME','python2.5', 'runcairns.py']) 
+        #subprocess.call(['python2.5', 'runcairns.py'])
         y = time.time()
 
         f = open(file_path_store,'r+')
-        x = 3#float(f.readline())
+        x = float(f.readline())
         f.close()
 
         f = open(file_path_storen,'r+')
-        i = 3#float(f.readline())
+        i = float(f.readline())
         f.close()
 
         spamWriter.writerow([i,d,(l*l),x ,(y-z)])
-        spacelist = [0,0,0,0]
+        liststore.store = [0,0,0,0]
 
-for m in range(1,100,10):
+for m in range(90,100,10):
     rum(m)
 

trunk/anuga_work/development/mem_time_tests/triangles/area/runcairns.py

@@ -19 +19 @@
 import time
 import sys
-import main
+import liststore
 
 # Related major packages
@@ -27 +27 @@
 from anuga.utilities import system_tools, log
 
-spacelist = [0,0,0,0]
 
-#home = os.getenv('INUNDATIONHOME')
-scenariodir2 = add_directories(main.home, ["data", "mem_time_test", "triangles", "area"])
+home2 = os.getenv('INUNDATIONHOME')
+
+scenariodir2 = add_directories(home2, ["data", "mem_time_test", "triangles", "area"])
 
 h = 'CAIRNS.msh'
@@ -39 +39 @@
 file_path_storen = os.path.join(scenariodir2, storen)
 storel = 'storel.txt'
-file_path_storel = os.path.join(scenariodir2, store)
-storea = 'store.txt'
+file_path_storel = os.path.join(scenariodir2, storel)
+storea = 'storea.txt'
 file_path_storea = os.path.join(scenariodir2, storea)
 
@@ -121 +121 @@
     
 
-spacelist[myid] = system_tools.MemoryUpdate()[0]
-a = sum(spacelist)
+liststore.store[myid] = system_tools.MemoryUpdate()[0]
+a = sum(liststore.store)
 
 v = open(file_path_store, 'r+')