Changeset 1090

Timestamp:

Mar 16, 2005, 6:16:12 PM (20 years ago)

Author:

prow

Message:

Removing tracing.
More testing.

Location:

inundation/ga/storm_surge/pyvolution

Files:

• _test_sww2domain2.py (modified) (1 diff)
• data_manager.py (modified) (6 diffs)

inundation/ga/storm_surge/pyvolution/_test_sww2domain2.py

@@ -79 +79 @@
     assert allclose(eval('domain.'+bit),eval('domain2.'+bit))
 
+print max(max(domain2.get_quantity('xmomentum')))
+print min(min(domain2.get_quantity('xmomentum')))
+print max(max(domain2.get_quantity('ymomentum')))
+print min(min(domain2.get_quantity('ymomentum')))
+
+assert max(max(domain2.get_quantity('xmomentum')))==0
+assert min(min(domain2.get_quantity('xmomentum')))==0
+assert max(max(domain2.get_quantity('ymomentum')))==0
+assert min(min(domain2.get_quantity('ymomentum')))==0
+
 print 'passed'

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1545 +1545 @@
     from domain import Domain
     from Numeric import asarray, transpose
-    print 'Reading from ', filename
+    #print 'Reading from ', filename
     fid = NetCDFFile(filename, 'r')    #Open existing file for read
     time = fid.variables['time']       #Timesteps
@@ -1572 +1572 @@
     other_quantities = []
 #
-    print '    interpolating quantities'
+    #print '    interpolating quantities'
     for quantity in fid.variables.keys():
         dimensions = fid.variables[quantity].dimensions
@@ -1588 +1588 @@
     conserved_quantities.remove('time')
 #
-    print other_quantities
-    print conserved_quantities
-    print '    building domain'
+    #print other_quantities
+    #print conserved_quantities
+    #print '    building domain'
     domain = Domain(coordinates, volumes,\
                     conserved_quantities = conserved_quantities,\
@@ -1599 +1599 @@
     for quantity in other_quantities:
         X = fid.variables[quantity][:]
-        print quantity
-        print 'max(X)'
-        print max(X)
-        print 'max(X)==NaN'
-        print max(X)==NaN
+        #print quantity
+        #print 'max(X)'
+        #print max(X)
+        #print 'max(X)==NaN'
+        #print max(X)==NaN
         if (max(X)==NaN) or (min(X)==NaN):
             if fail_if_NaN:
@@ -1615 +1615 @@
     for quantity in conserved_quantities:
         X = interpolated_quantities[quantity]
-        print quantity
-        print 'max(X)'
-        print max(X)
-        print 'max(X)==NaN'
-        print max(X)==NaN
+        #print quantity
+        #print 'max(X)'
+        #print max(X)
+        #print 'max(X)==NaN'
+        #print max(X)==NaN
         if (max(X)==NaN) or (min(X)==NaN):
             if fail_if_NaN:
@@ -1628 +1628 @@
                 X = (X*data)+(data==0)*NaN_filler
         domain.set_quantity(quantity,X)
-#
     return domain