Changeset 5741 for anuga_work/development/anuga_1d/domain.py

Timestamp:

Sep 5, 2008, 9:16:45 PM (15 years ago)

Author:

steve

Message:

Updated timestepping

File:

• anuga_work/development/anuga_1d/domain.py (modified) (6 diffs)

anuga_work/development/anuga_1d/domain.py

@@ -724 +724 @@
     #--------------------------    
 
-    def evolve(self, yieldstep = None, finaltime = None, duration = None,
+    def evolve(self, yieldstep = None,
+               finaltime = None,
+               duration = None,
                skip_initial_step = False):
         """Evolve model through time starting from self.starttime.
@@ -759 +761 @@
 
         from config import min_timestep, max_timestep, epsilon
-
-        print 'yieldstep', yieldstep
-        print 'duration', duration
 
         # FIXME: Maybe lump into a larger check prior to evolving
@@ -1388 +1387 @@
     def update_timestep(self, yieldstep, finaltime):
 
-        from config import min_timestep
+        from config import min_timestep, max_timestep
 
         # self.timestep is calculated from speed of characteristics
         # Apply CFL condition here
-        timestep = self.CFL*self.timestep
+        timestep = min(self.CFL*self.flux_timestep, max_timestep)
 
         #Record maximal and minimal values of timestep for reporting
@@ -1459 +1458 @@
     
     #def update_conserved_quantities(self):
-    def update_conserved_quantities(self,timestep):
+    def update_conserved_quantities(self):
         """Update vectors of conserved quantities using previously
         computed fluxes specified forcing functions.
@@ -1469 +1468 @@
         d = len(self.conserved_quantities)
 
-        #timestep = self.timestep
+        timestep = self.timestep
 
         #Compute forcing terms
-        #self.compute_forcing_terms()
+        self.compute_forcing_terms()
 
         #Update conserved_quantities
@@ -1479 +1478 @@
             Q.update(timestep)
 
-            #Clean up
-            #Note that Q.explicit_update is reset by compute_fluxes
-
-            #MH090605 commented out the following since semi_implicit_update is now re-initialized
-            #at the end of the _update function in quantity_ext.c (This is called by the
-            #preceeding Q.update(timestep) statement above).
-            #For run_profile.py with N=128, the time of update_conserved_quantities is cut from 14.00 secs
-            #to 8.35 secs
-
-            #Q.semi_implicit_update[:] = 0.0
+
 
 if __name__ == "__main__":