Changeset 835

Timestamp:

Feb 7, 2005, 10:02:41 AM (20 years ago)

Author:

ole

Message:

Worked on file boundary and conversions

Location:

inundation/ga/storm_surge/pyvolution

Files:

• generic_boundary_conditions.py (modified) (3 diffs)
• test_data_manager.py (modified) (1 diff)
• test_generic_boundary_conditions.py (modified) (5 diffs)
• test_least_squares.py (modified) (1 diff)
• test_util.py (modified) (3 diffs)
• util.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

@@ -116 +116 @@
 
 
-class File_boundary(Boundary):
+class File_boundary_time(Boundary):
     """Boundary values obtained from file and interpolated.
     conserved quantities as a function of time.
@@ -123 +123 @@
 
     No spatial info assumed.
+    FIXME: Soon to be Obsolete
     """
 
@@ -156 +157 @@
         t = self.domain.time
         return self.F(t)
+
+
+
+
+class File_boundary(Boundary):
+    """Boundary values obtained from file and interpolated.
+    conserved quantities as a function of time.
+
+    Assumes that file contains a time series and possibly
+    also spatial info.
+    See docstring for File_function in util.py for details about
+    admissible file formats
+    """
+
+
+    def __init__(self, filename, domain):
+        import time
+        from Numeric import array
+        from config import time_format
+        from util import File_function
+        
+        Boundary.__init__(self)
+
+        self.F = File_function(filename, domain)
+        self.domain = domain
+
+        #Get x,y vertex coordinates for all triangles
+        V = domain.vertex_coordinates
+        
+        #Compute midpoint coordinates for all boundary elements
+        midpoint_coordinates = {}
+        for vol_id, edge_id in domain.boundary.keys():
+            
+            x0 = V[vol_id, 0]; y0 = V[vol_id, 1]
+            x1 = V[vol_id, 2]; y1 = V[vol_id, 3]
+            x2 = V[vol_id, 4]; y2 = V[vol_id, 5]            
+
+            #Midpoints        
+            if edge_id == 0: m = array([(x1 + x2)/2, (y1 + y2)/2])
+            if edge_id == 1: m = array([(x0 + x2)/2, (y0 + y2)/2])
+            if edge_id == 2: m = array([(x1 + x0)/2, (y1 + y0)/2])            
+            midpoint_coordinates[(vol_id, edge_id)] = m 
+        
+        self.midpoint_coordinates = midpoint_coordinates    
+
+        #Test
+        q = self.F(0, 0, 0)
+
+        d = len(domain.conserved_quantities)
+        msg = 'Values specified in file must be a list or an array of length %d' %d
+        assert len(q) == d, msg
+
+        
+    def __repr__(self):
+        return 'File boundary'
+
+    def evaluate(self, vol_id=None, edge_id=None):
+        """Return linearly interpolated values based on domain.time
+
+        vol_id and edge_id are ignored
+        """
+
+        t = self.domain.time
+
+        if vol_id is not None and edge_id is not None:
+            x, y = self.midpoint_coordinates[ vol_id, edge_id ]
+            return self.F(t, x, y)
+        else:
+            return self.F(t)
+
+
+
+
 
 

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -560 +560 @@
         fid.close()
         
-        os.remove(filename)
-        os.remove(root + '.xya')        
-
+
+        os.remove(root + '.xya')
+        os.remove(root + '.dem')                
+        os.remove(root + '.asc')        
         
         

inundation/ga/storm_surge/pyvolution/test_generic_boundary_conditions.py

@@ -101 +101 @@
 
 
-    def test_fileboundary(self):
+    def test_fileboundary_time_only(self):
         """Test that boundary values can be read from file and interpolated
         """
@@ -113 +113 @@
         a = [0.0, 0.0]
         b = [0.0, 2.0]
-        c = [2.0,0.0]
+        c = [2.0, 0.0]
         d = [0.0, 4.0]
         e = [2.0, 2.0]
-        f = [4.0,0.0]
+        f = [4.0, 0.0]
 
         points = [a, b, c, d, e, f]
@@ -135 +135 @@
         domain.check_integrity()
         
-        domain.check_integrity()
 
         #Write file
@@ -151 +150 @@
         
         F = File_boundary(filename, domain)
-        os.remove(filename)        
-
+        os.remove(filename)
+        
+
+        #Check that midpoint coordinates at boundary are correctly computed
+        #print domain.boundary
+        #print F.midpoint_coordinates
+        assert allclose(F.midpoint_coordinates[(3,2)], [0.0, 3.0])
+        assert allclose(F.midpoint_coordinates[(3,1)], [1.0, 3.0])
+        assert allclose(F.midpoint_coordinates[(0,2)], [0.0, 1.0])
+        assert allclose(F.midpoint_coordinates[(0,0)], [1.0, 0.0])
+        assert allclose(F.midpoint_coordinates[(2,0)], [3.0, 0.0])
+        assert allclose(F.midpoint_coordinates[(2,1)], [3.0, 1.0])          
+
+
+        #Check time interpolation
         from config import default_boundary_tag
         domain.set_boundary( {default_boundary_tag: F} )
@@ -167 +179 @@
 
 
-
+    def test_fileboundary_time_and_space(self):
+        """Test that boundary values can be read from file and interpolated
+        Include both time and space
+        """
+
+        from domain import Domain
+        from quantity import Quantity
+
+        raise 'Not yet implemented'
 
     def test_fileboundary_exception(self):

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -512 +512 @@
         assert allclose(attributes, ref)
 
-        
+        os.remove(FN)
         
 

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -192 +192 @@
         assert allclose( 2*sin(120*pi/600)/3 + sin(60*pi/600)/3, q[2] )
         
-
+        os.remove(filename)
         
 
@@ -268 +268 @@
         assert allclose( 2*sin(120*pi/600)/3 + sin(60*pi/600)/3, q[2] )
         
-
+        os.remove(filename)
+        
 
     def test_file_function_time_with_domain_different_start(self):
@@ -336 +337 @@
         assert allclose( 2*sin(120*pi/600)/3 + sin(60*pi/600)/3, q[2] )
         
+        os.remove(filename)        
 
     def test_xya_ascii(self):

inundation/ga/storm_surge/pyvolution/util.py

@@ -109 +109 @@
     NOTE: At this stage the function is assumed to depend on
     time only, i.e  no spatial dependency!!!!!
-    When that is need we can use the least_squares interpolation.
+    When that is needed we can use the least_squares interpolation.
     """
 
@@ -189 +189 @@
             self.read_times() #Now read all times in.
         else:
-            raise 'x,y dependecy not yet implemented'
+            raise 'x,y dependency not yet implemented'
 
         
@@ -237 +237 @@
         FIXME: x, y dependency not yet implemented except that
         result is a vector of same length as x and y
+        FIXME: Naaaa
         """
 
@@ -275 +276 @@
             return q
         else:
-            from Numeric import ones, Float
-            #Create one constant column for each value
-            N = len(x)
-            assert len(y) == N, 'x and y must have same length'
-
-            res = []
-            for col in q:
-                res.append(col*ones(N, Float))
+            try:
+                N = len(x)
+            except:
+                return q
+            else:
+                from Numeric import ones, Float
+                #x is a vector - Create one constant column for each value
+                N = len(x)
+                assert len(y) == N, 'x and y must have same length'
+             
+                res = []
+                for col in q:
+                    res.append(col*ones(N, Float))
             
-            return res
+                return res
+            
 
 def read_xya(filename, format = 'netcdf'):