Changeset 3928 for anuga_core/source/anuga/shallow_water

Timestamp:

Nov 7, 2006, 1:13:03 PM (18 years ago)

Author:

ole

Message:

Parallel domains now store only full triangles in sww files.
Still need to remove ghost nodes.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (3 diffs)
• shallow_water_domain.py (modified) (16 diffs)
• test_shallow_water_domain.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -213 +213 @@
         #Create filename
         self.filename = create_filename(domain.get_datadir(),
-            domain.get_name(), extension)
+                                        domain.get_name(), extension)
 
         #print 'F', self.filename
         self.timestep = 0
-        self.number_of_volumes = len(domain)
         self.domain = domain
+        
+
+
+        # Exclude ghosts in case this is a parallel domain
+        self.number_of_nodes = domain.number_of_full_nodes        
+        self.number_of_volumes = domain.number_of_full_triangles
+        #self.number_of_volumes = len(domain)        
+
+
 
 
@@ -277 +285 @@
             if hasattr(domain, 'texture'):
                 fid.texture = domain.texture
-        #else:
+            #else:
             #    fid.texture = 'None'
 
@@ -291 +299 @@
             if domain.smooth is True:
                 fid.createDimension('number_of_points', len(domain.vertexlist))
+                #fid.createDimension('number_of_points', self.number_of_nodes)
+
+                # FIXME(Ole): This will cause sww files for paralle domains to
+                # have ghost nodes stored (but not used by triangles).
+                # To clean this up, we have to change get_vertex_values and friends in
+                # quantity.py (but I can't be bothered right now)
             else:
                 fid.createDimension('number_of_points', 3*self.number_of_volumes)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -112 +112 @@
                  processor=0,
                  numproc=1,
-                 number_of_full_nodes=0,
-                 number_of_full_triangles=0):
+                 number_of_full_nodes=None,
+                 number_of_full_triangles=None):
 
 
@@ -746 +746 @@
     import sys
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
 
     #Shortcuts
@@ -820 +820 @@
     import sys
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
 
     #Shortcuts
@@ -848 +848 @@
     import sys
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
 
     #Shortcuts
@@ -960 +960 @@
 
     #Update
-    #FIXME: Modify accroditg to c-version - or discard altogether.
-    for k in range(domain.number_of_elements):
+    #FIXME: Modify according to c-version - or discard altogether.
+    for k in range(len(domain)):
 
         if hc[k] < domain.minimum_allowed_height:
@@ -999 +999 @@
     """
 
-    N = domain.number_of_elements
+    N = len(domain)
     beta_h = domain.beta_h
 
@@ -1069 +1069 @@
     """
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
     beta_h = domain.beta_h
 
@@ -1114 +1114 @@
     hvbar = h_limiter(domain)
 
-    for k in range(domain.number_of_elements):
+    for k in range(len(domain)):
         #Compute maximal variation in bed elevation
         #  This quantitiy is
@@ -1402 +1402 @@
     g = domain.g
 
-    for k in range(domain.number_of_elements):
+    for k in range(len(domain)):
         avg_h = sum( h[k,:] )/3
 
@@ -1454 +1454 @@
     ymom_update = domain.quantities['ymomentum'].semi_implicit_update
 
-    N = domain.number_of_elements
+    N = len(domain)
     eps = domain.minimum_allowed_height
     g = domain.g
@@ -1489 +1489 @@
     ymom_update = ymom.semi_implicit_update
 
-    N = domain.number_of_elements
+    N = len(domain)
     eps = domain.minimum_allowed_height
     g = domain.g
@@ -1516 +1516 @@
     ymom_update = ymom.explicit_update
 
-    N = domain.number_of_elements
+    N = len(domain)
     eps = domain.minimum_allowed_height
     g = domain.g
@@ -1543 +1543 @@
     ymom_update = domain.quantities['ymomentum'].semi_implicit_update
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
     eps = domain.minimum_allowed_height
     g = domain.g #Not necessary? Why was this added?
@@ -1681 +1681 @@
         ymom_update = domain.quantities['ymomentum'].explicit_update
 
-        N = domain.number_of_elements
+        N = len(domain) # number_of_triangles
         t = domain.time
 
@@ -1767 +1767 @@
     #Computed linear combination between constant stages and and
     #stages parallel to the bed elevation.
-    for k in range(domain.number_of_elements):
+    for k in range(len(domain)):
         #Compute maximal variation in bed elevation
         #  This quantitiy is
@@ -2034 +2034 @@
     from Numeric import zeros, Float
 
-    N = domain.number_of_elements
+    N = len(domain) # number_of_triangles
 
     #Shortcuts

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -1311 +1311 @@
         const = eta_w*rho_a/rho_w
 
-        N = domain.number_of_elements
+        N = len(domain) # number_of_triangles
 
         xc = domain.get_centroid_coordinates()
@@ -1427 +1427 @@
         const = eta_w*rho_a/rho_w
 
-        N = domain.number_of_elements
+        N = len(domain) # number_of_triangles
 
         t = domain.time
@@ -1922 +1922 @@
         #Assert that quantities are conserved
         from Numeric import sum
-        for k in range(mesh.number_of_elements):
+        for k in range(len(mesh)):
             assert allclose (ref_centroid_values[k],
                              sum(stage.vertex_values[k,:])/3)
@@ -1944 +1944 @@
 
         #Assert that all vertex quantities have changed
-        for k in range(mesh.number_of_elements):
+        for k in range(len(mesh)):
             #print ref_vertex_values[k,:], stage.vertex_values[k,:]
             assert not allclose (ref_vertex_values[k,:], stage.vertex_values[k,:])
         #and assert that quantities are still conserved
         from Numeric import sum
-        for k in range(mesh.number_of_elements):
+        for k in range(len(mesh)):
             assert allclose (ref_centroid_values[k],
                              sum(stage.vertex_values[k,:])/3)
@@ -2212 +2212 @@
 
             #print t, volume, initial_volume
-
-
-            #if not allclose (volume, initial_volume):
-            #    print 't==4.05'
-            #    for k in range(domain.number_of_elements):
-            #       pass
-            #       print domain.quantities['stage'].centroid_values[k] -\
-            #             ref_centroid_values[k]
 
             assert allclose (volume, initial_volume)