Changeset 5586

Timestamp:

Jul 30, 2008, 4:59:59 PM (15 years ago)

Author:

ole

Message:

Rating curves for culverts

Files:

• anuga_core/source/anuga/culvert_flows/culvert_class.py (modified) (5 diffs)
• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (2 diffs)
• anuga_core/source/anuga/utilities/system_tools.py (modified) (1 diff)
• anuga_work/development/culvert_flow/plot_rating_curve.py (added)

anuga_core/source/anuga/culvert_flows/culvert_class.py

@@ -107 +107 @@
         label += '_' + str(id(self)) 
         
-        # Open log file for storing some specific results...
-        self.log_filename = label + '.log' 
         self.label = label
-
-        # Print something
+        
+        # File for storing culvert quantities
+        self.timeseries_filename = label + '_timeseries.csv'
+        fid = open(self.timeseries_filename, 'w')
+        fid.write('time, E0, E1, Velocity, Discharge\n')
+        fid.close()
+
+        # Log file for storing general textual output
+        self.log_filename = label + '.log'         
         log_to_file(self.log_filename, self.label)        
         log_to_file(self.log_filename, description)
@@ -142 +147 @@
         bounding_polygon = domain.get_boundary_polygon()
         for key in P.keys():
-            print 'Key', key
             if key in ['exchange_polygon0', 
                        'exchange_polygon1',
@@ -149 +153 @@
                 for point in P[key]:
                 
-                    print 'Passing in:', point
                     msg = 'Point %s in polygon %s for culvert %s did not'\
                         %(str(point), key, self.label)
@@ -271 +274 @@
             ux = xmomentum/(depth+velocity_protection/depth)   # Velocity (x-direction)
             uy = ymomentum/(depth+velocity_protection/depth)   # Velocity (y-direction)
-            print 'Velocity in culvert:', ux, uy, depth, xmomentum, ymomentum
+            #print 'Velocity in culvert:', ux, uy, depth, xmomentum, ymomentum
             v = mean(sqrt(ux**2+uy**2))      # Average velocity
             w = mean(stage)                  # Average stage
@@ -390 +393 @@
         log_to_file(log_filename, s)
 
+        # Log timeseries to file
+        fid = open(self.timeseries_filename, 'a')        
+        fid.write('%f, %f, %f, %f, %f\n'\
+                      %(time, 
+                        openings[0].total_energy,
+                        openings[1].total_energy,
+                        barrel_velocity,
+                        Q))
+        fid.close()
+
+        # Update momentum        
         delta_t = time - self.last_time
         if delta_t > 0.0:

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -953 +953 @@
 
 
+def csv2array(file_name):
+    """Convert CSV files of the form
+    
+    time, discharge, velocity
+    0.0,  1.2,       0.0
+    0.1,  3.2,       1.1
+    ...
+    
+    to a dictionary of numeric arrays.
+    
+    
+    See underlying function csv2dict for more details.
+    
+    """
+    
+    
+    X, _ = csv2dict(file_name)
+    
+    Y = {}
+    for key in X.keys():
+        Y[key] = array([float(x) for x in X[key]])
+        
+    return Y    
+    
+            
 def csv2dict(file_name, title_check_list=None):
     """
@@ -961 +986 @@
     Two dictionaries are returned.
     
-    WARNING: Vaules are returned as strings.
+    WARNING: Values are returned as strings.
     do this to change a list of strings to a list of floats
         time = [float(x) for x in time]

anuga_core/source/anuga/utilities/system_tools.py

@@ -7 +7 @@
 import os
 
-def log_to_file(filename, s, verbose=True):
-    """Log string to open file descriptor
+def log_to_file(filename, s, verbose=False):
+    """Log string to file name
     """