Changeset 462

Timestamp:

Oct 28, 2004, 5:13:46 PM (20 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• domain.py (modified) (5 diffs)
• shallow_water.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -31 +31 @@
 
         if other_quantities is None:
-            other_quantities = []
+            self.other_quantities = []
+        else:
+            self.other_quantities = other_quantities            
+            
 
         #Build dictionary of Quantity instances keyed by quantity names
         self.quantities = {}
+
+        #FIXME: remove later
         for name in self.conserved_quantities:
             self.quantities[name] = Conserved_quantity(self)
-        for name in other_quantities:
+        for name in self.other_quantities:
             self.quantities[name] = Quantity(self)
 
@@ -139 +144 @@
         """
         for key in quantity_dict.keys():
-            self.set_quantity(key,quantity_dict[key], location='vertices')
+            self.set_quantity(key, quantity_dict[key], location='vertices')
         
     def set_quantity(self, name, X, location='vertices'):
@@ -157 +162 @@
         """
 
+        from quantity import Quantity, Conserved_quantity
+        
+        #Create appropriate quantity object
+        ##if name in self.conserved_quantities:
+        ##    self.quantities[name] = Conserved_quantity(self)
+        ##else:
+        ##    self.quantities[name] = Quantity(self)            
+
+        #Set value    
         self.quantities[name].set_values(X, location)
         
@@ -247 +261 @@
     
 
+    #def set_defaults(self):
+    #    """Set default values for uninitialised quantities.
+    #    Should be overridden or specialised by specific modules
+    #    """#
+    #
+    #    for name in self.conserved_quantities + self.other_quantities:
+    #        self.set_quantity(name, 0.0)        
+                
 
     ###########################
@@ -267 +289 @@
         from config import min_timestep, max_timestep, epsilon
 
+
+        ##self.set_defaults()
+
         if yieldstep is None:
             yieldstep = max_timestep
 
-
         self.order = self.default_order
         
-            
+           
         self.yieldtime = 0.0 #Time between 'yields'
 

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -54 +54 @@
 
         #Establish shortcuts to relevant quantities (for efficiency)
-        self.w = self.quantities['level']
-        self.uh = self.quantities['xmomentum']                  
-        self.vh = self.quantities['ymomentum']                          
-        self.z = self.quantities['elevation']           
-        self.eta = self.quantities['friction']                  
+        #self.w = self.quantities['level']
+        #self.uh = self.quantities['xmomentum']                 
+        #self.vh = self.quantities['ymomentum']                         
+        #self.z = self.quantities['elevation']          
+        #self.eta = self.quantities['friction']                 
 
     def check_integrity(self):
@@ -99 +99 @@
         #(either from this module or C-extension)        
         distribute_to_vertices_and_edges(self)
+
+
+    #FIXME: Under construction    
+#     def set_defaults(self):
+#         """Set default values for uninitialised quantities.
+#         This is specific to the shallow water wave equation
+#         Defaults for 'elevation', 'friction', 'xmomentum' and 'ymomentum'
+#         are 0.0. Default for 'level' is whatever the value of 'elevation'.
+#         """
+
+#         for name in self.other_quantities + self.conserved_quantities:
+#             print name
+#             print self.quantities.keys()
+#             if not self.quantities.has_key(name):
+#                 if name == 'level':
+                    
+#                     if self.quantities.has_key('elevation'):
+#                         z = self.quantities['elevation'].vertex_values
+#                         self.set_quantity(name, z) 
+#                     else:
+#                         self.set_quantity(name, 0.0)                        
+#                 else:    
+#                     self.set_quantity(name, 0.0)
+                    
+
+
+#         #Lift negative heights up
+#         #z = self.quantities['elevation'].vertex_values
+#         #w = self.quantities['level'].vertex_values
+
+#         #h = w-z
+
+#         #for k in range(h.shape[0]):
+#         #    for i in range(3):
+#         #        if h[k, i] < 0.0:
+#         #            w[k, i] = z[k, i]
+
+                    
+#         #self.quantities['level'].interpolate()
+