Changeset 1642

Timestamp:

Jul 26, 2005, 5:52:20 PM (19 years ago)

Author:

ole

Message:

Comments

File:

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

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -60 +60 @@
 Generic_domain = Domain #Rename
 
-#Shalow water domain
+#Shallow water domain
 class Domain(Generic_domain):
 
@@ -261 +261 @@
         """
         self.writer.store_timestep(name)
+
 
 ####################MH 090605 new extrapolation function belonging to domain class
@@ -633 +634 @@
 
 
-
-# def dry(domain):
-#     """Protect against infinitesimal heights and associated high velocities
-#     at vertices
-#     """
-
-#     #FIXME: Experimental (from old version). Not in use at the moment
-
-#     #Shortcuts
-#     wv = domain.quantities['stage'].vertex_values
-#     zv = domain.quantities['elevation'].vertex_values
-#     xmomv = domain.quantities['xmomentum'].vertex_values
-#     ymomv = domain.quantities['ymomentum'].vertex_values
-#     hv = wv - zv  #Water depths at vertices
-
-#     #Update
-#     for k in range(domain.number_of_elements):
-#         hmax = max(hv[k, :])
-
-#         if hmax < domain.minimum_allowed_height:
-#             #Control stage
-#             wv[k, :] = zv[k, :]
-
-#             #Control momentum
-#             xmomv[k,:] = ymomv[k,:] = 0.0
-
-
 def protect_against_infinitesimal_and_negative_heights(domain):
     """Protect against infinitesimal heights and associated high velocities
     """
-
-    #FIXME: Look here for error
 
     #Shortcuts
@@ -673 +645 @@
     hc = wc - zc  #Water depths at centroids
 
-    #print zc
-    #print '1', wc
     #Update
     for k in range(domain.number_of_elements):
@@ -685 +655 @@
             #Control momentum
             xmomc[k] = ymomc[k] = 0.0
-
-    #print '2', wc
 
 
@@ -811 +779 @@
 def balance_deep_and_shallow(domain):
     """Compute linear combination between stage as computed by
-    gradient-limiters limiting using w, and stage computed as
-    constant height above bed and limited using h.
+    gradient-limiters limiting using w, and stage computed by
+    gradient-limiters limiting using h (h-limiter).
     The former takes precedence when heights are large compared to the
     bed slope while the latter takes precedence when heights are
@@ -822 +790 @@
     The h-limiter is always applied irrespective of the order.
     """
-
-    #New idea.
-    #
-    # In the presence and near of bedslope it is necessary to
-    # limit slopes based on differences in h rather than w
-    # (which is what is needed away from the bed).
-    #
-    # So whether extrapolation was first order or second order,
-    # it will need to be balanced with a h-limited gradient.
-    #
-    # For this we will use the quantity alpha as before
-    #
 
     #Shortcuts
@@ -1440 +1396 @@
 
 
+
+
 ###########################
 ###########################
@@ -1720 +1678 @@
 
 
-    #distribute_to_vertices_and_edges = distribute_to_vertices_and_edges_c
+    #distribute_to_vertices_and_edges = distribute_to_vertices_and_edges_c #(like MH's)