Changeset 5832 for anuga_work/development/anuga_1d/shallow_water_domain.py

Timestamp:

Oct 11, 2008, 12:38:18 PM (15 years ago)

Author:

steve

Message:

 

File:

• anuga_work/development/anuga_1d/shallow_water_domain.py (modified) (9 diffs)

anuga_work/development/anuga_1d/shallow_water_domain.py

@@ -54 +54 @@
         conserved_quantities = ['stage', 'xmomentum']
         other_quantities = ['elevation', 'friction']
-        Generic_Domain.__init__(self, coordinates, boundary,
-                                conserved_quantities, other_quantities,
-                                tagged_elements)
+        Generic_Domain.__init__(self,
+                                coordinates = coordinates,
+                                boundary = boundary,
+                                conserved_quantities = conserved_quantities,
+                                other_quantities = other_quantities,
+                                tagged_elements = tagged_elements)
         
         from config import minimum_allowed_height, g, h0
@@ -68 +71 @@
         #print "\nI have Removed forcing terms line 64 1dsw"
 
-        #Realtime visualisation
-        self.visualiser = None
-        self.visualise  = False
-        self.visualise_color_stage = False
-        self.visualise_stage_range = 1.0
-        self.visualise_timer = True
-        self.visualise_range_z = None
         
         #Stored output
@@ -82 +78 @@
 
         #Evolve parametrs
-        self.cfl = 1.0
+        self.set_CFL(1.0)
         
         #Reduction operation for get_vertex_values
@@ -89 +85 @@
         #self.reduction = min  #Looks better near steep slopes
 
-        self.quantities_to_be_stored = ['stage','xmomentum']
+        self.set_quantities_to_be_stored(['stage','xmomentum'])
 
         self.__doc__ = 'shallow_water_domain'
 
+        self.check_integrity()
 
     def set_quantities_to_be_stored(self, q):
@@ -125 +122 @@
         
 
-    def initialise_visualiser(self,scale_z=1.0,rect=None):
-        #Realtime visualisation
-        if self.visualiser is None:
-            from realtime_visualisation_new import Visualiser
-            self.visualiser = Visualiser(self,scale_z,rect)
-            self.visualiser.setup['elevation']=True
-            self.visualiser.updating['stage']=True
-        self.visualise = True
-        if self.visualise_color_stage == True:
-            self.visualiser.coloring['stage'] = True
-            self.visualiser.qcolor['stage'] = (0.0, 0.0, 0.8)
-        print 'initialise visualiser'
-        print self.visualiser.setup
-        print self.visualiser.updating
-
     def check_integrity(self):
-        Generic_Domain.check_integrity(self)
+
         #Check that we are solving the shallow water wave equation
 
@@ -149 +131 @@
         assert self.conserved_quantities[1] == 'xmomentum', msg
 
+        msg = 'First evolved quantity must be "stage"'
+        assert self.evolved_quantities[0] == 'stage', msg
+        msg = 'Second evolved quantity must be "xmomentum"'
+        assert self.evolved_quantities[1] == 'xmomentum', msg        
+
+        Generic_Domain.check_integrity(self)
+        
     def extrapolate_second_order_sw(self):
         #Call correct module function
@@ -584 +573 @@
         import sys
 
+        cfl = domain.get_CFL()
         
         timestep = float(sys.maxint)
@@ -596 +586 @@
         #print 'g=',g
         #print 'The type of g is',type(g)
+
+        h0 = domain.h0
         
         neighbours = domain.neighbours
@@ -652 +644 @@
         from comp_flux_ext import compute_fluxes_ext
         
-        domain.flux_timestep = compute_fluxes_ext(timestep,
-                                  epsilon,
-                                  g,
-                                  neighbours,
-                                  neighbour_vertices,
-                                  normals,
-                                  areas, 
-                                  stage_edge_values,
-                                  xmom_edge_values,
-                                  bed_edge_values,
-                                  stage_boundary_values,
-                                  xmom_boundary_values,
-                                  stage_explicit_update,
-                                  xmom_explicit_update,
-                                  number_of_elements,
-                                  max_speed_array)
+        domain.flux_timestep = compute_fluxes_ext(cfl,
+                                                  timestep,
+                                                  epsilon,
+                                                  g,
+                                                  h0,
+                                                  neighbours,
+                                                  neighbour_vertices,
+                                                  normals,
+                                                  areas, 
+                                                  stage_edge_values,
+                                                  xmom_edge_values,
+                                                  bed_edge_values,
+                                                  stage_boundary_values,
+                                                  xmom_boundary_values,
+                                                  stage_explicit_update,
+                                                  xmom_explicit_update,
+                                                  number_of_elements,
+                                                  max_speed_array)