Changeset 1662

Timestamp:

Aug 1, 2005, 12:13:53 PM (19 years ago)

Author:

ole

Message:

Georeferencing defaults

Location:

inundation/ga/storm_surge/pyvolution

Files:

• coordinate_transforms/geo_reference.py (modified) (4 diffs)
• domain.py (modified) (1 diff)
• general_mesh.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/coordinate_transforms/geo_reference.py

@@ -18 +18 @@
     def __init__(self,
                  zone = DEFAULT_ZONE,
-                 xllcorner = None,
-                 yllcorner = None,
+                 xllcorner = 0.0,
+                 yllcorner = 0.0,
                  datum = 'wgs84',
                  projection = 'UTM',
@@ -41 +41 @@
         self.zone = zone        
         self.units = units
-        
-
-
-        #Easting of lower left corner
-        if xllcorner is not None:
-            self.xllcorner = xllcorner 
-        else:
-            self.xllcorner = self.false_easting   
-
-
-        #Northing of lower left corner
-        if yllcorner is not None:
-            self.yllcorner = yllcorner
-        else:    
-            self.yllcorner = self.false_northing  
-
-
+        self.xllcorner = xllcorner
+        self.yllcorner = yllcorner        
+            
         if NetCDFObject is not None:
             self.read_NetCDF(NetCDFObject)
@@ -142 +128 @@
                 
             
-            
         #convert into array
         points = array(points).astype(Float) 
@@ -166 +151 @@
 
     def get_origin(self):
-        return (self.zone,self.xllcorner,self.yllcorner)
+        return (self.zone, self.xllcorner, self.yllcorner)
     
     def __repr__(self):
-        return "(%i %f,%f)" % (self.zone,self.xllcorner,self.yllcorner)
+        return "(%i %f,%f)" % (self.zone, self.xllcorner, self.yllcorner)
     
     def __cmp__(self,other):

inundation/ga/storm_surge/pyvolution/domain.py

@@ -72 +72 @@
         self.min_timestep = self.max_timestep = 0.0
         self.starttime = 0 #Physical starttime if any (0 is 1 Jan 1970 00:00:00)
+
+        ######OBSOLETE
         #Origin in UTM coordinates
         #FIXME: This should be set if read by a msh file

inundation/ga/storm_surge/pyvolution/general_mesh.py

@@ -1 +1 @@
 
-from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
+from coordinate_transforms.geo_reference import Geo_reference
 
 class General_mesh:
@@ -67 +67 @@
 
         if geo_reference is None:
-            self.geo_reference = Geo_reference(DEFAULT_ZONE,0.0,0.0)
+            self.geo_reference = Geo_reference() #Use defaults 
         else:
             self.geo_reference = geo_reference