Changeset 624

Timestamp:

Nov 24, 2004, 4:56:52 PM (20 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• bed_w_eden_boundary.py (modified) (1 diff)
• bed_w_file_boundary.py (modified) (2 diffs)
• util.py (modified) (1 diff)
• wiki/issues.txt (modified) (1 diff)
• wind_example_variable.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/bed_w_eden_boundary.py

@@ -47 +47 @@
                    f=lambda t: [(1*sin(t*pi/20)), 0.0, 0.0])
 
-Bf = File_boundary(domain, filename)
+Bf = File_boundary(filename, domain)
 
 #domain.set_boundary({'left': Bw, 'right': Br, 'top': Br, 'bottom': Br})

inundation/ga/storm_surge/pyvolution/bed_w_file_boundary.py

@@ -20 +20 @@
 domain.smooth = False
 domain.visualise = True
-domain.newstyle = False #(Better in this case)
 domain.default_order=2
 
@@ -63 +62 @@
                    f=lambda t: [(10*sin(t*0.1*pi)), 0.0, 0.0])
 
-Bf = File_boundary(domain, filename)
+Bf = File_boundary(filename, domain)
 
 #domain.set_boundary({'left': Bw, 'right': Br, 'top': Br, 'bottom': Br})

inundation/ga/storm_surge/pyvolution/util.py

@@ -96 +96 @@
         from config import time_format
 
+        assert type(filename) == type(''),\
+               'First argument to File_function must be a string'
+
+
         try:
             fid = open(filename)
         except Exception, e:
-            msg = 'File %s could not be opened: %s\n'\
+            msg = 'File "%s" could not be opened: Error="%s"'\
                   %(filename, e)
             raise msg

inundation/ga/storm_surge/pyvolution/wiki/issues.txt

@@ -2 +2 @@
 OPEN ISSUES:
 ------------
+
+Issue (Malpasset example):
+Pmesh no longer takes care of attributes but still accepts xya with attributes.
+
+Background:
+Chris imported xya file into pmesh. It contained x, y, bed elevation
+The tsh thus generated did add bed elevation, but didn't produce the proper 
+tsh file.
+
+Importance: mid
+Suggested actions: Either spit out an error message or generate a proper 
+tsh-header.
+
+  
+
+
 
 Issue: Exceptions thrown by Python functions called from C don't get caughts

inundation/ga/storm_surge/pyvolution/wind_example_variable.py

@@ -12 +12 @@
 
 #Create basic mesh
-N = 120
+N = 20
 length = 200
 points, vertices, boundary = rectangular(N, N, length, length)
@@ -32 +32 @@
 
 #Variable windfield implemented using functions
-def speed(x,y,t):
+def speed(t,x,y):
     """Large speeds halfway between center and edges
     Low speeds at center and edges
@@ -48 +48 @@
 
 
-def phi(x,y,t):
+def phi(t,x,y):
     """Rotating field
     """
@@ -76 +76 @@
 
 #Add lateral wind gusts bearing 25 deg
-def gust(x,y,t): 
+def gust(t,x,y): 
     from math import sin, pi
     from Numeric import zeros, ones, Float