Changeset 1953

Timestamp:

Oct 17, 2005, 9:50:08 PM (19 years ago)

Author:

steve

Message:

 

File:

• inundation/euler/euler.py (modified) (7 diffs)

inundation/euler/euler.py

@@ -54 +54 @@
 
 from domain import *
-from region import *#
+from region import *
 
 Generic_domain = Domain #Rename
@@ -139 +139 @@
 
 
-    #FIXME: Under construction
-#     def set_defaults(self):
-#         """Set default values for uninitialised quantities.
-#         This is specific to the shallow water wave equation
-#         Defaults for 'elevation', 'friction', 'xmomentum' and 'ymomentum'
-#         are 0.0. Default for 'stage' is whatever the value of 'elevation'.
-#         """
-
-#         for name in self.other_quantities + self.conserved_quantities:
-#             print name
-#             print self.quantities.keys()
-#             if not self.quantities.has_key(name):
-#                 if name == 'stage':
-
-#                     if self.quantities.has_key('elevation'):
-#                         z = self.quantities['elevation'].vertex_values
-#                         self.set_quantity(name, z)
-#                     else:
-#                         self.set_quantity(name, 0.0)
-#                 else:
-#                     self.set_quantity(name, 0.0)
-
-
-
-#         #Lift negative heights up
-#         #z = self.quantities['elevation'].vertex_values
-#         #w = self.quantities['stage'].vertex_values
-
-#         #h = w-z
-
-#         #for k in range(h.shape[0]):
-#         #    for i in range(3):
-#         #        if h[k, i] < 0.0:
-#         #            w[k, i] = z[k, i]
-
-
-#         #self.quantities['stage'].interpolate()
-
-
     def evolve(self, yieldstep = None, finaltime = None,
                skip_initial_step = False):
@@ -186 +147 @@
         #self.check_integrity()
 
-        msg = 'Parameter beta_h must be in the interval [0, 1['
-        assert 0 <= self.beta_h < 1.0, msg
-        msg = 'Parameter beta_w must be in the interval [0, 1['
-        assert 0 <= self.beta_w < 1.0, msg
-
+        msg = 'Parameter beta must be in the interval [0, 1['
+        assert 0 <= self.beta < 1.0, msg
 
         #Initial update of vertex and edge values before any storage
@@ -199 +157 @@
         #Initialise real time viz if requested
         if self.visualise is True and self.time == 0.0:
-            #pass
+
             import realtime_visualisation_new as visualise
-            #visualise.create_surface(self)
             self.initialise_visualiser()
             self.visualiser.setup_all()
@@ -209 +166 @@
         if self.store is True and self.time == 0.0:
             self.initialise_storage()
-            #print 'Storing results in ' + self.writer.filename
         else:
             pass
-            #print 'Results will not be stored.'
-            #print 'To store results set domain.store = True'
-            #FIXME: Diagnostic output should be controlled by
-            # a 'verbose' flag living in domain (or in a parent class)
 
         #Call basic machinery from parent class
@@ -222 +174 @@
             #Real time viz
             if self.visualise is True:
-                #pass
                 self.visualiser.update_all()
                 self.visualiser.update_timer()
@@ -238 +189 @@
 
     def initialise_storage(self):
-        """Create and initialise self.writer object for storing data.
+        """
+        Create and initialise self.writer object for storing data.
         Also, save x,y and bed elevation
         """