Changeset 8533

Timestamp:

Aug 23, 2012, 1:25:28 PM (13 years ago)

Author:

steve

Message:

A few enhancements to valuidation tests

Location:

trunk/anuga_core

Files:

• source/anuga/abstract_2d_finite_volumes/general_mesh.py (modified) (1 diff)
• source/anuga/fit_interpolate/fit.py (modified) (4 diffs)
• source/anuga_parallel/pypar_extras/setup.py (modified) (2 diffs)
• validation_tests/produce_results.py (modified) (1 diff)
• validation_tests/report.tex (modified) (5 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -720 +720 @@
         triangles ordered by node number. The (triangle_id, vertex_id)
         pairs are obtained from each index as (index/3, index%3) or each
-        index can be used directly into a flattened triangles array. This
+        index can be used directly into a flat triangles array. This
         is for example the case in the quantity.c where this structure is
         used to average vertex values efficiently.

trunk/anuga_core/source/anuga/fit_interpolate/fit.py

@@ -72 +72 @@
           triangles: List of 3-tuples (or a numeric array) of
               integers representing indices of all vertices in the mesh.
+
+          mesh: Object containing vertex_coordinates and triangles. Either
+              mesh = None or both vertex_coordinates and triangles = None
 
           mesh_origin: A geo_reference object or 3-tuples consisting of
@@ -333 +336 @@
                                      verbose=verbose)
 
+            import time
+            t0 = time.time()
             for i, geo_block in enumerate(G_data):
                 if verbose is True and 0 == i%200: 
@@ -360 +365 @@
                 msg = 'Matrix AtA was not built'
                 assert self.AtA is not None, msg
-                
+
+            print '**** Read Data time',time.time()-t0
             point_coordinates = None
         else:
@@ -479 +485 @@
     if use_cache is True:
         if isinstance(point_coordinates, basestring):
-            # We assume that point_coordinates is the name of a .csv/.txt
+            # We assume that point_coordinates is the name of a .csv/.txt/.pts
             # file which must be passed onto caching as a dependency 
             # (in case it has changed on disk)

trunk/anuga_core/source/anuga_parallel/pypar_extras/setup.py

@@ -50 +50 @@
 
 def _run_command(cmd):
-    out_file, in_file, err_file = popen2.popen3(cmd)
-    output = out_file.read() + err_file.read()
-    out_file.close()
-    in_file.close()
-    err_file.close()
-    # need this hack to get the exit status
+    import subprocess
+
     print 'running ' + cmd
-    out_file = os.popen(cmd)
-    if out_file.close():
-        # close returns exit status of command.
-        return ''
-    else:
-        # no errors, out_file.close() returns None.
-        return output
+    try:
+        output = subprocess.check_output(cmd, shell=True)
+    except:
+        output = ''
+
+    return output
+    
+    
 
 
@@ -71 +68 @@
     # LAM/OPENMPI/MPICH2
     output = _run_command('mpicc -show')
+
+
     if output:
         return output

trunk/anuga_core/validation_tests/produce_results.py

@@ -83 +83 @@
 
 
+cmd = 'pdflatex -shell-escape -interaction=batchmode report.tex'
+print cmd
+import subprocess
+subprocess.call( [cmd], shell=True )
+cmd = 'mv report.pdf report_cfl_%s_alg_%s.pdf' % (str(cfl), str(alg))
+print cmd
+subprocess.call( [cmd] , shell=True )
 
 
 
+
+

trunk/anuga_core/validation_tests/report.tex

@@ -16 +16 @@
 %=========================================
 
-\title{Automated Report on the Performance of \anuga on Various Test Problems}
+\title{Automated Report on the Performance of \anuga{} on Various Test Problems}
 \maketitle
 \tableofcontents
@@ -26 +26 @@
 The results in this report were produced by \anuga{} version \majorR{} 
 from svn repository revision \minorR{} at time \timeR.
-The flow algorithm was \alg{} and cfl condition \cfl.
+The flow algorithm was \alg{} and CFL condition \cfl.
 
 %======================
@@ -47 +47 @@
 
 %======================
-\chapter{Experimental Tests}
+\chapter{Benchmark Tests}
 %======================
 
@@ -72 +72 @@
 \TeX{} file \texttt{results.tex} and a python script
 \texttt{produce\_results.py}, which runs the simulation and produces the
-outputs. In this \TeX{} file, \texttt{report.tex}, add a line
+outputs. Copy the format from the other test directory. 
+
+In this \TeX{} file, \texttt{report.tex}, add a line
 \begin{verbatim}
 \inputresults{Tests/Directory/Name}
@@ -80 +82 @@
 
 \section{Specifiying different algorithm}
-One  way to allow the system to run with different algorithms is to add the following
+One  way to allow the system to run with different algorithms is to 
+add the following
 into your run routines.
 \begin{verbatim}