Changeset 243

Timestamp:

Aug 30, 2004, 4:58:48 PM (21 years ago)

Author:

ole

Message:

Clean up

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -339 +339 @@
 def distribute_to_vertices_and_edges(domain):
 
-    protect_against_negative_heights_centroid(domain)
+    protect_against_infintesimal_and_negative_heights(domain)    
     if domain.order == 1:
         extrapolate_first_order(domain)
@@ -353 +353 @@
 
 
-def protect_against_infinitesimal_heights(domain):
-    """Protect against infinitesimal heights and high speeds    
-    Adjust height and momentum at centroid if height is less than
-    minimum allowed height
-    """
-
-    #FIXME: May be unnecessary
-    #Shortcuts
-    wv = domain.quantities['level'].vertex_values
-    zv = domain.quantities['elevation'].vertex_values
-    wc = domain.quantities['level'].centroid_values
-    zc = domain.quantities['elevation'].centroid_values
-    hv = wv-zv
-    hc = wc - zc
-
-    for k in range(domain.number_of_elements):
-        hmax = max(hv[k,:])
-        
-        if hmax < domain.minimum_allowed_height:
-            
-            #Reset negative heights to bed elevation        
-            if hc[k] < 0.0:
-                print 'C'
-                wc[k] = zc[k]
-            for i in range(3):    
-                if hv[k,i] < 0.0:
-                    print 'V'                    
-                    wv[k,i] = zv[k,i]
-
-
-def protect_against_negative_heights_centroid(domain):
+
+def protect_against_infintesimal_and_negative_heights(domain):
     """Protect against infinitesimal heights and associated high velocities
     """
-
-    #FIXME: Change name appropriately
     
     #Shortcuts
@@ -501 +470 @@
 
     balance_deep_and_shallow(domain)
-    ##protect_against_infinitesimal_heights(domain)  #FIXME: Probably not necessary
-