Changeset 8188 for trunk/anuga_work/development/2010-projects/anuga_1d/pipe/pipe_domain.py

Timestamp:

Jun 19, 2011, 3:54:42 PM (14 years ago)

Author:

paul

Message:

Added state evolved quantity to pipe domain

File:

• trunk/anuga_work/development/2010-projects/anuga_1d/pipe/pipe_domain.py (modified) (10 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/pipe/pipe_domain.py

@@ -32 +32 @@
 b         width            width of pipe [m]
 t         top              height of pipe above z [m]
+st        state            state of the cell (pressurised or free surface
 eta                        mannings friction coefficient [to appear]
 
@@ -58 +59 @@
 
         conserved_quantities = ['area', 'discharge']
-        evolved_quantities = ['area', 'discharge', 'elevation', 'height', 'velocity','width','top','stage']
+        evolved_quantities = ['area', 'discharge', 'elevation', 'height', 'velocity','width','top','stage','state']
         other_quantities = ['friction']
         Generic_domain.__init__(self,
@@ -126 +127 @@
         msg = 'Eighth evolved quantity must be "stage"'
         assert self.evolved_quantities[7] == 'stage', msg
+        msg = 'Ninth evolved quantity must be "state"'
+        assert self.evolved_quantities[8] == 'state', msg
 
         Generic_domain.check_integrity(self)
@@ -156 +159 @@
     width      = domain.quantities['width']
     top        = domain.quantities['top']
+    state      = domain.quantities['state']
 
 
     from anuga_1d.pipe.pipe_domain_ext import compute_fluxes_pipe_ext
-    domain.flux_timestep = compute_fluxes_pipe_ext(timestep,domain,area,discharge,bed,height,velocity,width,top)
+    domain.flux_timestep = compute_fluxes_pipe_ext(timestep,domain,area,discharge,bed,height,velocity,width,top,state)
 
 #-----------------------------------------------------------------------
@@ -186 +190 @@
     top       = domain.quantities['top']
     stage     = domain.quantities['stage']
+    state     = domain.quantities['state']
 
     #Arrays   
@@ -196 +201 @@
     t_C   = top.centroid_values
     w_C   = stage.centroid_values
+    s_C   = state.centroid_values
 
     if domain.setstageflag:
@@ -241 +247 @@
     b_V  = width.vertex_values
     t_V  = top.vertex_values
+    s_V  = state.vertex_values
 
 
@@ -283 +290 @@
         self.top    = domain.quantities['top'].vertex_values
         self.stage    = domain.quantities['stage'].vertex_values
-
-        self.evolved_quantities = numpy.zeros(8, numpy.float)
+        self.state    = domain.quantities['state'].vertex_values
+
+        self.evolved_quantities = numpy.zeros(9, numpy.float)
 
     def __repr__(self):
@@ -304 +312 @@
         q[6] =  self.top[vol_id,edge_id]
         q[7] =  self.stage[vol_id,edge_id]
-
+        q[8] =  self.state[vol_id,edge_id]
         return q
 
@@ -322 +330 @@
             raise msg
 
-        assert len(evolved_quantities) == 8
+        assert len(evolved_quantities) == 9
 
         self.evolved_quantities=numpy.array(evolved_quantities,numpy.float)