Changeset 3021

Timestamp:

May 30, 2006, 4:17:18 PM (19 years ago)

Author:

steve

Message:

updated timestep using only full cells

Location:

inundation/pyvolution

Files:

• advection.py (modified) (4 diffs)
• domain.py (modified) (6 diffs)
• shallow_water.py (modified) (2 diffs)
• shallow_water_ext.c (modified) (4 diffs)

inundation/pyvolution/advection.py

@@ -218 +218 @@
 
                 #Update optimal_timestep
-                try:
-                    optimal_timestep = min(optimal_timestep, radii[k]/max_speed)
-                except ZeroDivisionError:
-                    pass
+                if  self.tri_full_flag == 1 :
+                    try:
+                        optimal_timestep = min(optimal_timestep, radii[k]/max_speed)
+                    except ZeroDivisionError:
+                        pass
 
             #Normalise by area and store for when all conserved
@@ -275 +276 @@
         radii           = self.radii
         edgelengths     = self.edgelengths
+        tri_full_flag   = self.tri_full_flag
 
         stage_edge      = Stage.edge_values
@@ -333 +335 @@
 
                 //Update optimal_timestep
-                if (max_speed != 0.0) {
-                    optimal_timestep = (optimal_timestep>radii(k)/max_speed) ? radii(k)/max_speed : optimal_timestep;
+                if (tri_full_flag(k) == 1) {
+                    if (max_speed != 0.0) {
+                        optimal_timestep = (optimal_timestep>radii(k)/max_speed) ? radii(k)/max_speed : optimal_timestep;
+                    }
                 }
 
@@ -351 +355 @@
         weave.inline(code, ['stage_edge','stage_bdry','stage_update',
                              'neighbours','neighbour_edges','normals',
-                             'areas','radii','edgelengths','huge_timestep',
+                             'areas','radii','edgelengths','tri_full_flag',
+                             'huge_timestep',
                              'timestep','v1','v2','N'],
                              type_converters = converters.blitz, compiler='gcc');

inundation/pyvolution/domain.py

@@ -79 +79 @@
                       verbose=verbose)
 
-        if verbose: print 'Initialising Domain'        
-        from Numeric import zeros, Float, Int
+        if verbose: print 'Initialising Domain'
+        from Numeric import zeros, Float, Int, ones
         from quantity import Quantity, Conserved_quantity
 
@@ -117 +117 @@
         # List of other quantity names
         if ghost_recv_dict  is None:
-            self.ghost_recv_dict  = []
+            self.ghost_recv_dict  = {}
         else:
             self.ghost_recv_dict  = ghost_recv_dict
@@ -125 +125 @@
 
         # Setup Communication Buffers
-           
+
         if verbose: print 'Domain: Set up communication buffers (parallel)'
         self.nsys = len(self.conserved_quantities)
@@ -136 +136 @@
             buffer_shape = self.ghost_recv_dict[key][0].shape[0]
             self.ghost_recv_dict[key].append(zeros( (buffer_shape,self.nsys) ,Float))
+
+
+        # Setup cell full flag
+        # =1 for full
+        # =0 for ghost
+        N=self.number_of_elements
+        self.tri_full_flag = ones(N, Int)
+        for i in self.ghost_recv_dict.keys():
+            for id in self.ghost_recv_dict[i][0]:
+                self.tri_full_flag[id] = 0
+
 
         #Defaults
@@ -186 +197 @@
             self.set_quantity_vertices_dict(vertex_quantity_dict)
 
-           
+
         if verbose: print 'Domain: Done'
 
-            
+
 
 
@@ -730 +741 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-                
+
 
     def evolve_to_end(self, finaltime = 1.0):

inundation/pyvolution/shallow_water.py

@@ -549 +549 @@
             flux -= edgeflux * domain.edgelengths[k,i]
 
-            #Update optimal_timestep
-            try:
-                timestep = min(timestep, 0.5*domain.radii[k]/max_speed)
-            except ZeroDivisionError:
-                pass
+            #Update optimal_timestep on full cells
+            if  domain.tri_full_flag[k] == 1:
+                try:
+                    timestep = min(timestep, 0.5*domain.radii[k]/max_speed)
+                except ZeroDivisionError:
+                    pass
 
         #Normalise by area and store for when all conserved
@@ -615 +616 @@
                                      domain.radii,
                                      domain.areas,
+                                     domain.tri_full_flag,
                                      Stage.edge_values,
                                      Xmom.edge_values,

inundation/pyvolution/shallow_water_ext.c

@@ -980 +980 @@
   PyArrayObject *neighbours, *neighbour_edges,
     *normals, *edgelengths, *radii, *areas,
+    *tri_full_flag,
     *stage_edge_values,
     *xmom_edge_values,
@@ -1004 +1005 @@
 
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "dddOOOOOOOOOOOOOOOOO",
+  if (!PyArg_ParseTuple(args, "dddOOOOOOOOOOOOOOOOOO",
                         &timestep,
                         &epsilon,
@@ -1012 +1013 @@
                         &normals,
                         &edgelengths, &radii, &areas,
+            &tri_full_flag,
                         &stage_edge_values,
                         &xmom_edge_values,
@@ -1090 +1092 @@
         //timestep = min(timestep, domain.radii[k]/max_speed)
         //FIXME: SR Add parameter for CFL condition
-        if (max_speed > epsilon) {
-          timestep = min(timestep, ((double *) radii -> data)[k]/max_speed);
-          //maxspeed in flux_function is calculated as max(|u+a|,|u-a|)
-          if (n>=0)
-            timestep = min(timestep, ((double *) radii -> data)[n]/max_speed);
-        }
+    if ( ((long *) tri_full_flag -> data)[k] == 1) {
+            if (max_speed > epsilon) {
+                timestep = min(timestep, ((double *) radii -> data)[k]/max_speed);
+                //maxspeed in flux_function is calculated as max(|u+a|,|u-a|)
+                if (n>=0)
+                    timestep = min(timestep, ((double *) radii -> data)[n]/max_speed);
+            }
+    }
     } // end for i
     //Normalise by area and store for when all conserved