Changeset 4418

Timestamp:

Apr 24, 2007, 10:16:25 AM (17 years ago)

Author:

ole

Message:

Ran Duncan's verbose tests, verified problem with mint and maxt, and fixed it.
Also a bit of cosmetics.

Location:

anuga_core/source/anuga

Files:

• shallow_water/data_manager.py (modified) (8 diffs)
• test_all.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2437 +2437 @@
         swwname = basename_out + '.sww'
 
-#    Get dimensions of file_h
+    # Get dimensions of file_h
     for dimension in file_h.dimensions.keys():
         if dimension[:3] == 'LON':
@@ -2454 +2454 @@
     longitudes = file_h.variables[dim_h_longitude]
     
-# get dimensions for file_e
+    # get dimensions for file_e
     for dimension in file_e.dimensions.keys():
         if dimension[:3] == 'LON':
@@ -2461 +2461 @@
             dim_e_latitude = dimension
 
-# get dimensions for file_u
+    # get dimensions for file_u
     for dimension in file_u.dimensions.keys():
         if dimension[:3] == 'LON':
@@ -2470 +2470 @@
             dim_u_time = dimension
             
-# get dimensions for file_v
+    # get dimensions for file_v
     for dimension in file_v.dimensions.keys():
         if dimension[:3] == 'LON':
@@ -2480 +2480 @@
 
 
-    #Precision used by most for lat/lon is 4 or 5 decimals
+    # Precision used by most for lat/lon is 4 or 5 decimals
     e_lat = around(file_e.variables[dim_e_latitude][:], 5)
     e_lon = around(file_e.variables[dim_e_longitude][:], 5)
 
-    #Check that files are compatible
+    # Check that files are compatible
     assert allclose(latitudes, file_u.variables[dim_u_latitude])
     assert allclose(latitudes, file_v.variables[dim_v_latitude])
@@ -2493 +2493 @@
     assert allclose(longitudes, e_lon)
 
-    if mint == None:
+    if mint is None:
         jmin = 0
+        mint = times[0]        
     else:
         jmin = searchsorted(times, mint)
         
-    if maxt == None:
-        jmax=len(times)
+    if maxt is None:
+        jmax = len(times)
+        maxt = times[-1]
     else:
         jmax = searchsorted(times, maxt)
@@ -2507 +2509 @@
     kmin, kmax, lmin, lmax = _get_min_max_indexes(latitudes[:],
                                                   longitudes[:],
-                                                 minlat, maxlat,
-                                                 minlon, maxlon)
-
-
-#    print' j', jmin, jmax
+                                                  minlat, maxlat,
+                                                  minlon, maxlon)
+
+
     times = times[jmin:jmax]
     latitudes = latitudes[kmin:kmax]
@@ -2756 +2757 @@
               %(geo_ref.get_xllcorner(), geo_ref.get_yllcorner())
         print ' Start time: %f' %starttime
-        #print '    Min time: %f' %mint
-        #print '    Max time: %f' %maxt
+        print '    Min time: %f' %mint
+        print '    Max time: %f' %maxt
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d'\

anuga_core/source/anuga/test_all.py

@@ -93 +93 @@
     load = unittest.defaultTestLoader.loadTestsFromModule
     testCaseClasses = map(load, modules)
+
+    
     if test_verbose is True:
         # Test the code by setting verbose to True.
@@ -99 +101 @@
         for test_suite in testCaseClasses:
             for tests in test_suite._tests:
-                #tests is of class TestSuite
-                print "tests weak", tests.__weakref__
-                if len(tests._tests) >1:
+                # tests is of class TestSuite
+                if len(tests._tests) > 1:
                     # these are the test functions
                     try:
-                        # Calls set_verbose in the test case classes
+                        # Calls class method set_verbose in the test case classes
+                        # print 'Tests', tests._tests[0]
+                        # print 'Type', type(tests._tests[0])                        
                         tests._tests[0].set_verbose()
                     except: