Changeset 7938

Timestamp:

Aug 12, 2010, 10:59:51 PM (15 years ago)

Author:

steve

Message:

adding in option for extrafractional steps.

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (6 diffs)
• shallow_water/shallow_water_domain.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -1449 +1449 @@
         self.distribute_to_vertices_and_edges()
 
+        # Initial update boundary values
+        self.update_boundary()
+
         # Update extrema if necessary (for reporting)
         self.update_extrema()
 
-        # Initial update boundary values
-        self.update_boundary()
+
 
         # Or maybe restore from latest checkpoint
@@ -1463 +1465 @@
 
         while True:
-            # Evolve One Step, using appropriate timestepping method
+
+            initial_time = self.time
+
+            #==========================================
+            # Apply fluid flow fractional step
+            #==========================================
             if self.get_timestepping_method() == 'euler':
                 self.evolve_one_euler_step(yieldstep, finaltime)
@@ -1472 +1479 @@
             elif self.get_timestepping_method() == 'rk3':
                 self.evolve_one_rk3_step(yieldstep, finaltime)
+
+
+            #==========================================
+            # Apply other fractional steps
+            #==========================================
+            #self.apply_fractional_steps()
+
+            #==========================================
+            # Centroid Values of variables should be ok,
+            # so now setup quantites etc for output
+            #==========================================
+
+            # Update time
+            self.time = initial_time + self.timestep
+
+            # Update vertex and edge values
+            self.distribute_to_vertices_and_edges()
+
+            # Update boundary values
+            self.update_boundary()
 
             # Update extrema if necessary (for reporting)
@@ -1539 +1566 @@
         self.update_ghosts()
 
-        # Update time
-        self.time += self.timestep
-
-        # Update vertex and edge values
-        self.distribute_to_vertices_and_edges()
-
-        # Update boundary values
-        self.update_boundary()
+
+
 
     ##
@@ -1615 +1636 @@
         self.update_ghosts()
 
-        # Update vertex and edge values
-        self.distribute_to_vertices_and_edges()
-
-        # Update boundary values
-        self.update_boundary()
 
     ##
@@ -1727 +1743 @@
         self.time = initial_time + self.timestep
 
-        # Update vertex and edge values
-        self.distribute_to_vertices_and_edges()
-
-        # Update boundary values
-        self.update_boundary()
 
     ##

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -241 +241 @@
 
 
-    def set_all_limiters(self, beta):
+    def set_all_betas(self, beta):
         """Shorthand to assign one constant value [0,1] to all limiters.
         0 Corresponds to first order, where as larger values make use of