Changeset 8326 for trunk/anuga_work/development/mem_time_tests/triangles/area/main.py

Timestamp:

Jan 31, 2012, 10:54:12 AM (12 years ago)

Author:

pittj

Message:

formatted the experiment scripts

File:

• trunk/anuga_work/development/mem_time_tests/triangles/area/main.py (modified) (5 diffs)

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

@@ -1 @@
-"""Simple water flow example using ANUGA
-Water flowing down a channel
-"""
 #------------------------------------------------------------------------------
 # Import necessary modules
 #------------------------------------------------------------------------------
-# Import standard shallow water domain and standard boundaries.
 import anuga
 import subprocess
@@ -12 +8 @@
 import time
 import liststore
-from anuga.utilities import system_tools, log
 from anuga.abstract_2d_finite_volumes.util import add_directories
-
+from anuga.utilities.log_analyser import analyse_log
 
 #------------------------------------------------------------------------------
-# Setup computational domain
+# Set up variables for the correct directories to store the output
 #------------------------------------------------------------------------------
-a = []
-#SpaceUsed = 0.0
-#number = 0
-
-home1 = os.getenv('INUNDATIONHOME')
+home = os.getenv('INUNDATIONHOME')
 host = os.getenv('HOST')
-scenariodir = add_directories(home1, ["data","mem_time_test", "triangles","area"])
+scenariodir = add_directories(home, ["data","mem_time_test", "triangles","area"])
 file1 = 'ex1.csv'
 file_path = os.path.join(scenariodir, file1)
@@ -32 +23 @@
 storea ='storea.txt'
 file_path_storea = os.path.join(scenariodir, storea)
-store ='store.txt'
-file_path_store = os.path.join(scenariodir, store)
 storen ='storen.txt'
 file_path_storen = os.path.join(scenariodir, storen)
 
-log.log_filename = os.path.join(scenariodir, 'log.txt')
-
+#create and set up the files
 spamWriter = csv.writer(open(file_path, 'wb'))
 spamWriter.writerow(['Number Of Triangles' ,'Max Triangle Area', 'Extent', 'Space Used MB' , 'Time Taken s'])
-e = open(file_path_store,'a')
-e.close()
 e = open(file_path_storea,'a')
 e.close()
@@ -50 +36 @@
 e.close()
 
+# this is the main loops that assigns the maximum triangle area (m) and the map side length(l)
 
+n = 4 #number of processors to use
 for m in range(90,100,10):
-     n = 4 #number of processors to use
      for l in range(100,2000,100):
         
+        #write these values to file
         g = open(file_path_storel,'r+')
         g.write(str(l))
+        h = open(file_path_storea,'r+')
+        h.write(str(m))
+        
+        z = time.time()# time it
 
-        h = open(file_path_storea,'r+')
-        h.write(str(d))
-        
-        z = time.time()
+        #the different ways each host calls MPI properly
         if (host == 'cyclone.agso.gov.au'):
-            subprocess.call(['mpirun', '-np', str(n), '-hostfile' ,'~/machinefiles/test.machines_cyclone', '-x','PYTHONPATH','-x','INUNDATIONHOME','python2.6', 'runcairns.py']) 
+            subprocess.call(['mpirun', '-np', str(n), '-hostfile' ,'~/machinefiles/test.machines_cyclone', '-x','PYTHONPATH','-x','INUNDATIONHOME','python', 'runcairns.py']) 
         if (host == 'tornado.agso.gov.au'):
-            subprocess.call(['mpirun', '-np', str(n), '-hostfile' ,'~/machinefiles/test.machines_tornado', '-x','PYTHONPATH','-x','INUNDATIONHOME','python2.6', 'runcairns.py'])
+            subprocess.call(['mpirun', '-np', str(n), '-hostfile' ,'~/machinefiles/test.machines_tornado', '-x','PYTHONPATH','-x','INUNDATIONHOME','python', 'runcairns.py'])
         if (host == 'vayu1'):
             subprocess.call(['mpirun', '-np', str(n), '-x','PYTHONPATH','-x','INUNDATIONHOME','python', 'runcairns.py']) 
@@ -73 +62 @@
             subprocess.call(['mpirun', '-np', str(n), '-x','PYTHONPATH','-x','INUNDATIONHOME','python', 'runcairns.py']) 
        
-        y = time.time()
+        y = time.time()# time it
 
-        f = open(file_path_store,'r+')
-        x = float(f.readline())
-        f.close()
-
+        # read the number of triangles from this file
         f = open(file_path_storen,'r+')
         i = float(f.readline())
         f.close()
 
-        spamWriter.writerow([i,d,(l*l),x ,(y-z)])
-        liststore.store = [0,0,0,0]
-
+        spamWriter.writerow([i,d,(l*l),'x' ,(y-z)])# record it
 
 print 'Done'
 
+analyse_log(scenariodir, 'metalog.csv') #get the memory statistics from the log files
+