Changeset 1950

Timestamp:

Oct 17, 2005, 5:47:56 PM (19 years ago)

Author:

steve

Message:

 

File:

• inundation/pyvolution/euler.py (modified) (6 diffs)

inundation/pyvolution/euler.py

@@ -58 +58 @@
 Generic_domain = Domain #Rename
 
-#Shallow water domain
+#Euler domain
 class Domain(Generic_domain):
 
@@ -65 +65 @@
                  use_inscribed_circle=False):
 
-        conserved_quantities = ['stage', 'xmomentum', 'ymomentum']
-        other_quantities = ['elevation', 'friction']
+        conserved_quantities = ['density', 'xmomentum', 'ymomentum', 'energy']
+        other_quantities = ['pressure']
         Generic_domain.__init__(self, coordinates, vertices, boundary,
                                 conserved_quantities, other_quantities,
                                 tagged_elements, geo_reference, use_inscribed_circle)
 
-        from config import minimum_allowed_height, g
-        self.minimum_allowed_height = minimum_allowed_height
-        self.g = g
-
-        self.forcing_terms.append(gravity)
-        self.forcing_terms.append(manning_friction)
+        from euler_config import minimum_allowed_density
+        self.minimum_allowed_density = minimum_allowed_density
 
         #Realtime visualisation
@@ -89 +85 @@
         self.store = False
         self.format = 'sww'
-        self.smooth = True
+        self.smooth = False
 
         #Reduction operation for get_vertex_values
@@ -96 +92 @@
         #self.reduction = min  #Looks better near steep slopes
 
-        self.quantities_to_be_stored = ['stage']
+        self.quantities_to_be_stored = ['density', 'xmomentum', 'ymomentum', 'energy', 'pressure']
 
 
         #Establish shortcuts to relevant quantities (for efficiency)
-        #self.w = self.quantities['stage']
-        #self.uh = self.quantities['xmomentum']
-        #self.vh = self.quantities['ymomentum']
-        #self.z = self.quantities['elevation']
-        #self.eta = self.quantities['friction']
+        self.rho = self.quantities['density']
+        self.mx = self.quantities['xmomentum']
+        self.my = self.quantities['ymomentum']
+        self.E = self.quantities['energy']
+
 
     def initialise_visualiser(self,scale_z=1.0,rect=None):
@@ -111 +107 @@
             from realtime_visualisation_new import Visualiser
             self.visualiser = Visualiser(self,scale_z,rect)
-            self.visualiser.setup['elevation']=True
         self.visualise = True
 
@@ -119 +114 @@
         #Check that we are solving the shallow water wave equation
 
-        msg = 'First conserved quantity must be "stage"'
+        msg = 'First conserved quantity must be "density"'
         assert self.conserved_quantities[0] == 'stage', msg
         msg = 'Second conserved quantity must be "xmomentum"'
         assert self.conserved_quantities[1] == 'xmomentum', msg
         msg = 'Third conserved quantity must be "ymomentum"'
+        assert self.conserved_quantities[2] == 'ymomentum', msg
+        msg = 'Fourth conserved quantity must be "energy"'
         assert self.conserved_quantities[2] == 'ymomentum', msg