Changeset 4050

Timestamp:

Dec 4, 2006, 11:58:25 AM (18 years ago)

Author:

duncan

Message:

do ticket#107

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (1 diff)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2602 +2602 @@
     if maxlat != None:
         assert -90 < maxlat < 90 , msg
+        if minlat != None:
+            assert maxlat > minlat
     if minlon != None:
         assert -180 < minlon < 180 , msg
     if maxlon != None:
         assert -180 < maxlon < 180 , msg
+        if minlon != None:
+            assert maxlon > minlon
+        
 
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -2748 +2748 @@
 
 
+    def test_ferret2sww_lat_long(self):
+        # Test that min lat long works
+
+        #The test file has
+        # LON = 150.66667, 150.83334, 151, 151.16667
+        # LAT = -34.5, -34.33333, -34.16667, -34 ;
+        
+        #Read
+        from anuga.coordinate_transforms.redfearn import redfearn
+        fid = NetCDFFile(self.test_MOST_file + '_ha.nc')
+        first_value = fid.variables['HA'][:][0,0,0]
+        fourth_value = fid.variables['HA'][:][0,0,3]
+        fid.close()
+
+
+        #Call conversion (with zero origin)
+        #ferret2sww('small', verbose=False,
+        #           origin = (56, 0, 0))
+        try:
+            ferret2sww(self.test_MOST_file, verbose=False,
+                   origin = (56, 0, 0), minlat=-34.5, maxlat=-35)
+        except AssertionError:
+            pass
+        else:
+            self.failUnless(0 ==1,  'Bad input did not throw exception error!')
 
     def test_sww_extent(self):