Changeset 2007

Timestamp:

Nov 7, 2005, 1:16:19 PM (18 years ago)

Author:

duncan

Message:

working on gippsland to sww

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (3 diffs)

inundation/pyvolution/data_manager.py

@@ -3140 +3140 @@
     outfile.order = 1
     
-
+    #FIXME(DSG) - hack to get a good sww file
+    number_of_times = 1
+    
     # dimension definitions
     outfile.createDimension('number_of_volumes', number_of_volumes)
@@ -3231 +3233 @@
     #outfile.variables['elevation'][:] = z  #FIXME HACK
     #outfile.variables['time'][:] = times   #Store time relative
-    #outfile.variables['time'][:] = [0]   #Store time relative
+    #outfile.variables['time'][:] = [0.0]   #Store time relative
     outfile.variables['volumes'][:] = volumes.astype(Int32) #On Opteron 64
 
     # do this to create an ok sww file?
-    #outfile.variables['time'][:] = [0]   #Store time relative
-    #outfile.variables['stage'] = z
+    outfile.variables['time'][:] = [0]   #Store time relative
+    outfile.variables['stage'] = z
     #outfile.variables['xmomentum'] = z
     #outfile.variables['ymomentum'] = z

inundation/pyvolution/test_data_manager.py

@@ -2709 +2709 @@
  cellsize       0.25
  nodata_value   -9999.0
-    90.000    60.000    30.0
+    9000.000    60.000    3000.0
    -10.000   -20.000   -30.000 
 """)
@@ -2747 +2747 @@
         y = fid.variables['y'][:]
         geo_ref = Geo_reference(NetCDFObject=fid)
+        #print "geo_ref",geo_ref 
+        x_ref = geo_ref.get_xllcorner()
+        y_ref = geo_ref.get_yllcorner()
+        self.failUnless(geo_ref.get_zone() == 55,  'Failed')
+        assert allclose(x_ref, 587798.418) # (-38, 148)
+        assert allclose(y_ref, 5793123.477)# (-38, 148.5)
         
+        #Zone:   55    
+        #Easting:  588095.674  Northing: 5821451.722 
+        #Latitude:   -37  45 ' 0.00000 ''  Longitude: 148 0 ' 0.00000 ''
+        assert allclose((x[0],y[0]), (588095.674 - x_ref, 5821451.722 - y_ref))
+
+        #Zone:   55    
+        #Easting:  632145.632  Northing: 5820863.269 
+        #Latitude:   -37  45 ' 0.00000 ''  Longitude: 148  30 ' 0.00000 '' 
+        assert allclose((x[2],y[2]), (632145.632 - x_ref, 5820863.269 - y_ref))
+
+        #Zone:   55    
+        #Easting:  609748.788  Northing: 5793447.860 
+        #Latitude:   -38  0 ' 0.00000 ''  Longitude: 148  15 ' 0.00000 '' 
+        assert allclose((x[4],y[4]), (609748.788  - x_ref, 5793447.860 - y_ref))
+
         fid.close()
     
@@ -2771 +2792 @@
         #Grid Convergence:  0  36 ' 56.52 ''  Point Scale: 0.99969494 
 
+
+        #Zone:   55    
+        #Easting:  631699.669  Northing: 5793123.477 
+        #Latitude:   -38 0 ' 0.00000 ''  Longitude: 148  30 ' 0.00000 '' 
+
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_asc_')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'xxxtest')