Changeset 5847 for anuga_core/source/anuga/advection/advection.py

Timestamp:

Oct 18, 2008, 9:13:18 PM (15 years ago)

Author:

steve

Message:

Changed parallel_api so that global mesh only needs to
be constructed on processor 0

File:

• anuga_core/source/anuga/advection/advection.py (modified) (3 diffs)

anuga_core/source/anuga/advection/advection.py

@@ -73 +73 @@
 
         #Only first is implemented for advection
-        self.default_order = self.order = 1
-
+        self.set_default_order(1)
+        self.set_beta(1.0)
+        
         self.smooth = True
 
@@ -82 +83 @@
         msg = 'Conserved quantity must be "stage"'
         assert self.conserved_quantities[0] == 'stage', msg
+
+
+    def distribute_to_vertices_and_edges(self):
+        """Extrapolate conserved quantities from centroid to
+        vertices and edge-midpoints for each volume
+
+        Default implementation is straight first order,
+        i.e. constant values throughout each element and
+        no reference to non-conserved quantities.
+        """
+
+        for name in self.conserved_quantities:
+            Q = self.quantities[name]
+            if self._order_ == 1:
+                Q.extrapolate_first_order()
+            elif self._order_ == 2:
+                Q.extrapolate_second_order_and_limit_by_edge()
+                #Q.limit()
+            else:
+                raise 'Unknown order'
+            #Q.interpolate_from_vertices_to_edges()
+
+
 
 
@@ -161 +185 @@
 
 
-    def evolve(self,
-               yieldstep = None,
-               finaltime = None,
-               duration = None,
-               skip_initial_step = False):
-
-        """Specialisation of basic evolve method from parent class
-        """
-
-        #Call basic machinery from parent class
-        for t in Generic_domain.evolve(self,
-                                       yieldstep=yieldstep,
-                                       finaltime=finaltime,
-                                       duration=duration,
-                                       skip_initial_step=skip_initial_step):
-
-            #Pass control on to outer loop for more specific actions
-            yield(t)
+##     def evolve(self,
+##                yieldstep = None,
+##                finaltime = None,
+##                duration = None,
+##                skip_initial_step = False):
+
+##         """Specialisation of basic evolve method from parent class
+##         """
+
+##         #Call basic machinery from parent class
+##         for t in Generic_domain.evolve(self,
+##                                        yieldstep=yieldstep,
+##                                        finaltime=finaltime,
+##                                        duration=duration,
+##                                        skip_initial_step=skip_initial_step):
+
+##             #Pass control on to outer loop for more specific actions
+##             yield(t)