Changeset 8324

Timestamp:

Jan 24, 2012, 2:37:24 PM (13 years ago)

Author:

pittj

Message:

update to work with NCI testing

fj
gfh

Location:

trunk/anuga_work/development/mem_time_tests/NCIparallel/area

Files:

• main.py (modified) (6 diffs)
• runcairns.py (modified) (2 diffs)

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

@@ +1 @@
+#below is the first code that worked on NCI and is here to remain unchanged
+#and just be an example read NCI.doc to how the code was reworked to run on NCI
+#it is not perfect, but it did work as of revision 8322
 """Simple water flow example using ANUGA
 Water flowing down a channel
@@ -14 +17 @@
 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
 
 #------------------------------------------------------------------------------
@@ -36 +39 @@
 file_path_storen = os.path.join(scenariodir, storen)
 
-log.log_filename = os.path.join(scenariodir, 'log.txt')
+log.log_filename = os.path.join(scenariodir, 'log.txt
 
 spamWriter = csv.writer(open(file_path, 'wb'))
@@ -53 +56 @@
      f = 4
      for l in range(400,500,100):
-        
+
         g = open(file_path_storel,'r+')
         g.write(str(l))
@@ -59 +62 @@
         h = open(file_path_storea,'r+')
         h.write(str(d))
-        
+
         z = time.time()
-        subprocess.call(['mpirun', '-np', str(f), '-hostfile' ,'~/machinefiles/t.machines_tornado', '-x','PYTHONPATH','-x','INUNDATIONHOME','python2.5', 'runcairns.py']) 
+        subprocess.call(['mpirun','-np','8','-x','PYTHONPATH','-x','INUNDATIONHOME','python','runcairns.py'])
+        #subprocess.call(['mpirun', '-np', str(f), '-hostfile' ,'~/machinefiles/t.machines_tornado','-x','PYTHONPATH','-x','INUNDATIONHOME','python2.5', 'ru$
         #subprocess.call(['python2.5', 'runcairns.py'])
         y = time.time()
@@ -80 +84 @@
 
 print 'Done'
-
+analyse_log(scenariodir, 'metalog.csv')

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

@@ -51 +51 @@
 f.close()
 
+scenariodirV = add_directories(home2, ["data","mem_time_test", "triangles",
+                                     "area", "triangles-" + str(area) +"-"+ str(length)])
+
+h = 'CAIRNS.msh'
+file_pathh = os.path.join(scenariodirV, h)
+
+log.log_filename = os.path.join(scenariodirV, "anuga.log")
+log._setup = False
+
 system_tools.MemoryUpdate()
 #------------------------------------------------------------------------------
@@ -80 +89 @@
 #------------------------------------------------------------------------------
 domain.set_name('CAIRNS.sww') # Name of sww file
-domain.set_datadir(scenariodir2)                       # Store sww output here
+domain.set_datadir(scenariodirV)                       # Store sww output here
 
 #------------------------------------------------------------------------------