Changeset 268

Timestamp:

Sep 2, 2004, 3:40:28 AM (21 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• config.py (modified) (1 diff)
• run_profile.py (modified) (1 diff)
• shallow_water.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/config.py

@@ -62 +62 @@
 
 use_psyco = True  #Use psyco optimisations
-use_psyco = False  #Do not use psyco optimisations
+#use_psyco = False  #Do not use psyco optimisations
 
 

inundation/ga/storm_surge/pyvolution/run_profile.py

@@ -2 +2 @@
 
 This version is for profiling
-
+(The original)
 """
 

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -37 +37 @@
         self.forcing_terms.append(manning_friction)
 
-        #Fixme: Perhaps establish shortcuts tp relevant quantities 
-        #once and for all (for efficiency)
+        #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']                  
+        
     
     def check_integrity(self):
@@ -334 +339 @@
                                      Xmom.explicit_update,
                                      Ymom.explicit_update)
-        
+                                     
 
 ####################################
@@ -352 +357 @@
     for name in domain.conserved_quantities:
         Q = domain.quantities[name]
-        Q.interpolate_from_vertices_to_edges()            
-
+        Q.interpolate_from_vertices_to_edges()
+                    
+    #domain.w.interpolate_from_vertices_to_edges()            
+    #domain.uh.interpolate_from_vertices_to_edges()            
+    #domain.vh.interpolate_from_vertices_to_edges()                    
+    
 
 
@@ -373 +382 @@
                 if hc[k] < 0.0:
                     #Control level and height
-                    wc[k] = zc[k]; hc[k] = 0.0
+                    wc[k] = zc[k] #; hc[k] = 0.0
 
                 #Control momentum
@@ -380 +389 @@
             if hc[k] < 0.0:
                 #Control level and height
-                wc[k] = zc[k]; hc[k] = 0.0
+                wc[k] = zc[k]  #; hc[k] = 0.0
 
                 #Control momentum