Changeset 4831

Timestamp:

Nov 20, 2007, 10:56:13 AM (17 years ago)

Author:

duncan

Message:

working on ticket#220

Location:

anuga_core/source/anuga/pmesh

Files:

• mesh.py (modified) (2 diffs)
• test_mesh.py (modified) (2 diffs)

anuga_core/source/anuga/pmesh/mesh.py

@@ -1106 +1106 @@
         mode is a string that sets conditions on the mesh generations
         see triangle_instructions.txt for a definition of the commands
-        PreCondition: maxArea is a double
+        
+        PreCondition: maxArea is a double between 1e-20 and 1e30 or is a
+        string.
         """
         #print "mode ",mode
@@ -1137 +1139 @@
         if maxArea != None:
             self.mode += 'a' + str(maxArea)
+            try:
+                self.mode += 'a' + '%20.20f' %maxArea
+            except TypeError:
+                self.mode += 'a' + str(maxArea)
+            #print "self.mode", self.mode
         #FIXME (DSG-DSG) This isn't explained. 
         if isRegionalMaxAreas:

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -2324 +2324 @@
         self.failUnless(points_ab==points_new,
                         'FAILED!')
+
+    def mode_string_float_problems(self):
+        numbers = [0.0000000001,1000000000000.0, 1e-19,1e19, 1e-25,1e30,1e40,
+                   1e41,'0.00001','0.000000000000000000000000000000000001']
+        numbers = [1e-21,1e-20,1e30,1e35,1e40]
+        for num in numbers:
+            mode = 'a' + str(num)
+            #print " mode += 'a' + str(num)", mode
+            print "====================="
+            
+            try:
+                mode = 'a' + '%20.20f' %num
+            except TypeError:
+                mode = 'a' + str(num)
+            print "mode += 'a' + '%20.20f' %num", mode
+        #print "", mode
         
         
@@ -2332 +2348 @@
             yes = False
     return yes
-
-
             
 #-------------------------------------------------------------
 if __name__ == "__main__":
     suite = unittest.makeSuite(meshTestCase,'test')
-    #suite = unittest.makeSuite(meshTestCase,'test_exportoutlinefile')
+    #suite = unittest.makeSuite(meshTestCase,'mode_string_float_problems')
     #suite = unittest.makeSuite(meshTestCase,'test_exportPointsFile')
     runner = unittest.TextTestRunner() # verbosity=2)