Changeset 8326 for trunk/anuga_work/development/mem_time_tests/hardware/cairns/runcairns.py

Timestamp:

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

Author:

pittj

Message:

formatted the experiment scripts

File:

• trunk/anuga_work/development/mem_time_tests/hardware/cairns/runcairns.py (modified) (9 diffs)

trunk/anuga_work/development/mem_time_tests/hardware/cairns/runcairns.py

@@ -10 +10 @@
 
 Geoscience Australia, 2004-present
+
+This has remained unchanged aside from the parallelism added, the resource statistics
+and the output directories, its also been scaled down so it runs faster
 """
 
@@ -19 +22 @@
 import time
 import sys
+import anuga
+from anuga_parallel import distribute, myid, numprocs
+from anuga.abstract_2d_finite_volumes.util import add_directories
+from anuga.utilities import log
 
-# Related major packages
-import anuga
-import liststore
 
 # Application specific imports
 import project                 # Definition of file names and polygons
 
-from anuga_parallel import distribute, myid, numprocs, finalize, barrier
-from anuga.abstract_2d_finite_volumes.util import add_directories
-from anuga.utilities import system_tools, log
+
+# set up variables for the correct output directories
+home = os.getenv('INUNDATIONHOME')
+scenariodir = add_directories(home, ["data", "mem_time_test", "parallel", "cairns"])
+h = 'CAIRNS.msh'
+file_pathh = os.path.join(scenariodir, h)
+store ='store.txt'
+file_path_store = os.path.join(scenariodir, store)
+scenariodirV = add_directories(home, ["data","mem_time_test", "parallel",
+                                       "cairns", "parrallel-" + str(numprocs) +"-"+str(myid)])
+log.log_filename = os.path.join(scenariodirV, "anuga.log")
+log._setup = False
 
 
-home2 = os.getenv('INUNDATIONHOME')
-
-scenariodir2 = add_directories(home2, ["data", "mem_time_test", "parallel", "cairns"])
-
-h = 'CAIRNS.msh'
-file_pathh = os.path.join(scenariodir2, h)
-store ='store.txt'
-file_path_store = os.path.join(scenariodir2, store)
-
-
-system_tools.MemoryUpdate()
-
+log.resource_usage_timing(prefix = 'BeforeSimulation')#get memory statistics at this point
 #------------------------------------------------------------------------------
 # Preparation of topographic data
@@ -49 +51 @@
 #------------------------------------------------------------------------------
 # Create DEM from asc data
-anuga.asc2dem(os.path.join(scenariodir2, 'cairns.asc'), use_cache=True, verbose=True)
+anuga.asc2dem(os.path.join(scenariodir, 'cairns.asc'), use_cache=True, verbose=True)
 
 # Create pts file for onshore DEM
-anuga.dem2pts(os.path.join(scenariodir2,'cairns.dem'), use_cache=True, verbose=True)
+anuga.dem2pts(os.path.join(scenariodir,'cairns.dem'), use_cache=True, verbose=True)
 
 #------------------------------------------------------------------------------
@@ -58 +60 @@
 # overall clipping polygon with a tagged
 # boundary and interior regions as defined in project.py
+# (in serial, so the set up only runs once)
 #------------------------------------------------------------------------------
 if myid == 0:
@@ -77 +80 @@
 else:
     domain = None
+
+log.resource_usage_timing(prefix = 'AfterMesh')#get memory statistics at this point
      
+#parallel
 domain = distribute(domain)
                                
@@ -84 +90 @@
 #------------------------------------------------------------------------------
 domain.set_name('cairns_' + project.scenario) # Name of sww file
-domain.set_datadir(scenariodir2)                       # Store sww output here
+domain.set_datadir(scenariodirV)                       # Store sww output here
 domain.set_minimum_storable_height(0.01)      # Store only depth > 1cm
 
@@ -95 +101 @@
 domain.set_quantity('friction', 0.0) 
 domain.set_quantity('elevation', 
-                    filename=os.path.join(scenariodir2, 'cairns.pts'),
+                    filename=os.path.join(scenariodir, 'cairns.pts'),
                     use_cache=True,
                     verbose=True,
                     alpha=0.1)
+log.resource_usage_timing(prefix='afterinitialconditions') #get memory statistics at this point
 
 #------------------------------------------------------------------------------
@@ -138 +145 @@
                          'onshore': Bd,
                          'top': Bd})
-
+log.resource_usage_timing(prefix='afterboundary') #get memory statistics at this point
 #------------------------------------------------------------------------------
 # Evolve system through time
@@ -175 +182 @@
         print domain.boundary_statistics(tags='ocean_east')
             
+
 print 'That took %.2f seconds' %(time.time()-t0)
 
-liststore.spacelist[myid] = system_tools.MemoryUpdate()[0]
-a = sum(liststore.spacelist)
-
-f = open(file_path_store, 'r+')
-f.write(str(a))
-
+log.resource_usage_timing(prefix='aftersimulation') #get memory statistics at this point