Changeset 2494 for development/euler

Timestamp:

Mar 8, 2006, 2:26:58 PM (19 years ago)

Author:

ole

Message:

Introduced duration keyword in evolve and updated dependencies

Location:

development/euler

Files:

• euler.py (modified) (3 diffs)
• test_euler.py (modified) (1 diff)

development/euler/euler.py

@@ -139 +139 @@
 
 
-    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
         """
@@ -170 +174 @@
 
         #Call basic machinery from parent class
-        for t in Generic_domain.evolve(self, yieldstep, finaltime,
-                                       skip_initial_step):
+        #for t in Generic_domain.evolve(self, yieldstep, finaltime,
+        #                               skip_initial_step):
+
+        for t in Generic_domain.evolve(self,
+                                       yieldstep=yieldstep,
+                                       finaltime=finaltime,
+                                       duration=duration,
+                                       skip_initial_step=skip_initial_step):            
             #Real time viz
             if self.visualise is True:
@@ -295 +305 @@
     """
 
-    from config import g, epsilon
+    from pyvolution.config import g, epsilon
     from math import sqrt
     from Numeric import array

development/euler/test_euler.py

@@ -4 +4 @@
 from math import sqrt, pi
 
-from config import g, epsilon
+from pyvolution.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
 from shallow_water import *