Changeset 5740

Timestamp:

Sep 5, 2008, 5:11:58 PM (17 years ago)

Author:

steve

Message:

 

Location:

anuga_work/development/anuga_1d

Files:

• config.py (modified) (1 diff)
• domain.py (modified) (5 diffs)
• shallow_water_domain.py (modified) (2 diffs)

anuga_work/development/anuga_1d/config.py

@@ -78 +78 @@
 beta_w = 1.5
 beta_h = 0.2
+timestepping_method = 'euler'
+
 CFL = 1.0  #FIXME (ole): Is this in use yet??
            #(Steve) yes, change domain.CFL to

anuga_work/development/anuga_1d/domain.py

@@ -20 +20 @@
 
         from Numeric import array, zeros, Float, Int
+
+        from config import timestepping_method
+        from config import CFL
+
+
         
         #Store Points
@@ -34 +39 @@
         self.beta = 1.0
         self.limiter = "minmod_kurganov"
+        self.CFL = CFL
+        self.set_timestepping_method(timestepping_method)
+
         self.wet_nodes = zeros((N,2), Int) # should this be here
 
@@ -538 +546 @@
         return self.centroids
 
+
+    def get_timestepping_method(self):
+        return self.timestepping_method
+
+    def set_timestepping_method(self,timestepping_method):
+        
+        if timestepping_method in ['euler', 'rk2', 'rk3']:
+            self.timestepping_method = timestepping_method
+            return
+
+        msg = '%s is an incorrect timestepping type'% timestepping_method
+        raise Exception, msg
+
+
     def set_quantity(self, name, *args, **kwargs):
         """Set values for named quantity
@@ -702 +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.
@@ -740 +759 @@
 
         from config import min_timestep, max_timestep, epsilon
+
+        print 'yieldstep', yieldstep
+        print 'duration', duration
 
         # FIXME: Maybe lump into a larger check prior to evolving

anuga_work/development/anuga_1d/shallow_water_domain.py

@@ -168 +168 @@
         distribute_to_vertices_and_edges(self)
         
-    def evolve(self, yieldstep = None, finaltime = None,
+    def evolve(self, yieldstep = None, finaltime = None, duration = None,
                skip_initial_step = False):
         """Specialisation of basic evolve method from parent class
@@ -207 +207 @@
 
         #Call basic machinery from parent class
-        for t in Generic_Domain.evolve(self, yieldstep, finaltime,
+        for t in Generic_Domain.evolve(self, yieldstep, finaltime,duration,
                                        skip_initial_step):
             #Real time viz