Changeset 9319

Timestamp:

Sep 3, 2014, 11:37:00 AM (10 years ago)

Author:

steve

Message:

added unit test for Rudy's degenerate triangle

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/general_mesh.py (modified) (1 diff)
• abstract_2d_finite_volumes/test_general_mesh.py (modified) (1 diff)
• validation_utilities/typeset_report.py (modified) (3 diffs)

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

@@ -169 +169 @@
         #assert num.allclose(self.areas, areas)
         
-        id = num.where(self.areas <= 0.0)
-        msg = 'Degenerate Triangle(s) '+str(id[0])
+        ind = num.where(self.areas <= 0.0)
+        msg = 'Degenerate Triangle(s) '+str(ind[0])
         assert num.all(self.areas > 0.0), msg
 

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

@@ -347 +347 @@
 
         assert domain.get_area() == 1.0
+        
+        
+        
+    def test_one_degenerate_triangles(self):
+
+        
+        a = num.array([1.0, 1.0])
+        b = num.array([0.0, 2.0])
+        c = num.array([2.0, 0.0])
+        d = num.array([0.0, 4.0])
+        e = num.array([2.0, 2.0])
+        f = num.array([4.0, 0.0])
+        nodes = num.array([a, b, c, d, e, f])
+
+        
+        #                        bac,     bce,     ecf,     dbe
+        triangles = num.array([[1,0,2], [1,2,4], [4,2,5], [3,1,4]], num.int)
+
+        try:
+            domain = General_mesh(nodes, triangles)
+        except AssertionError:
+            #print 'excepted assertion error'
+            pass
+            
+            
+
+    def test_two_degenerate_triangles(self):
+
+        
+        a = num.array([1.0, 1.0])
+        b = num.array([0.0, 2.0])
+        c = num.array([2.0, 0.0])
+        d = num.array([1.0, 2.0])
+        e = num.array([2.0, 2.0])
+        f = num.array([4.0, 0.0])
+        nodes = num.array([a, b, c, d, e, f])
+
+        
+        #                        bac,     bce,     ecf,     dbe
+        triangles = num.array([[1,0,2], [1,2,4], [4,2,5], [3,1,4]], num.int)
+
+        
+        try:
+            domain = General_mesh(nodes, triangles)
+        except AssertionError:
+            #print 'excepted assertion error'
+            pass
+
+
 
 

trunk/anuga_core/source/anuga/validation_utilities/typeset_report.py

@@ -1 +1 @@
 #! /usr/bin/python
 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
 
 __author__="steve"
@@ -10 +8 @@
 
 
-def typeset_report(report_name='report', verbose=False):
+def typeset_report(report_name='report', verbose=True):
     
     import os
+    import subprocess
 
     if verbose: 
@@ -19 +18 @@
         print 50*'='
 
-    os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)
-    os.system('bibtex %s' % report_name)
-    os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)
-    os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)   
+    cmd = 'pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name
+
+    try:
+        out = subprocess.check_output(cmd, shell=True)
+        out = subprocess.check_output('bibtex %s' % report_name)
+        out = subprocess.check_output(cmd, shell=True)
+        out = subprocess.check_output(cmd, shell=True)
+    except:
+        pass
+            
+    #os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)
+    #os.system('bibtex %s' % report_name)
+    #os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)
+    #os.system('pdflatex -shell-escape  -interaction=batchmode %s.tex' % report_name)