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

Timestamp:

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

Author:

steve

Message:

 

File:

• anuga_work/development/anuga_1d/domain.py (modified) (12 diffs)

anuga_work/development/anuga_1d/domain.py

@@ -7 +7 @@
    Geoscience Australia
 """
+
 from generic_boundary_conditions import *
-#from coordinate_transforms.geo_reference import Geo_reference
+
 
 class Domain:
 
-    def __init__(self, coordinates, boundary = None,
-                 conserved_quantities = None, other_quantities = None,
+    def __init__(self,
+                 coordinates,
+                 boundary = None,
+                 conserved_quantities = None,
+                 evolved_quantities = None,
+                 other_quantities = None,
                  tagged_elements = None):
         """
@@ -23 +28 @@
         from config import timestepping_method
         from config import CFL
-
-
         
         #Store Points
         self.coordinates = array(coordinates)
 
-# #        if geo_reference is None:
-# #            self. = Geo_reference() #Use defaults 
-# #        else:
-# #            self.geo_reference = geo_reference
 
         #Register number of Elements
@@ -38 +37 @@
 
         self.beta = 1.0
-        self.limiter = "minmod_kurganov"
-        self.CFL = CFL
+        self.set_limiter("minmod_kurganov")
+        self.set_CFL(CFL)
         self.set_timestepping_method(timestepping_method)
 
@@ -124 +123 @@
             self.conserved_quantities = conserved_quantities
 
+        if evolved_quantities is None:
+            self.evolved_quantities = self.conserved_quantities
+        else:
+            self.evolved_quantities = evolved_quantities
+
         if other_quantities is None:
             self.other_quantities = []
@@ -133 +137 @@
         self.quantities = {}
 
+        #print self.conserved_quantities
+        #print self.evolved_quantities
+        
+
         #FIXME: remove later - maybe OK, though....
-        for name in self.conserved_quantities:
+        for name in self.evolved_quantities:
             self.quantities[name] = Quantity(self)
         for name in self.other_quantities:
@@ -160 +168 @@
         self.number_of_steps = 0
         self.number_of_first_order_steps = 0
-        self.CFL = CFL
 
         #Model time
@@ -169 +176 @@
         #Checkpointing and storage
         from config import default_datadir
-        self.datadir = default_datadir
+        self.set_datadir(default_datadir)
         self.filename = 'domain'
         self.checkpoint = False
@@ -490 +497 @@
 
         return q
+
+
+    def get_evolved_quantities(self, vol_id, vertex=None):#, edge=None):
+        """Get evolved quantities at volume vol_id
+
+        If vertex is specified use it as index for vertex values
+        If edge is specified use it as index for edge values
+        If neither are specified use centroid values
+        If both are specified an exeception is raised
+
+        Return value: Vector of length == number_of_evolved quantities
+
+        """
+
+        from Numeric import zeros, Float
+
+        #if not (vertex is None):# or edge is None):
+        #    msg = 'Values for both vertex and edge was specified.'
+        #    msg += 'Only one (or none) is allowed.'
+       #     raise msg
+
+        q = zeros( len(self.evolved_quantities), Float)
+
+        for i, name in enumerate(self.evolved_quantities):
+            Q = self.quantities[name]
+            if vertex is not None:
+                q[i] = Q.vertex_values[vol_id, vertex]
+            #elif edge is not None:
+            #    q[i] = Q.edge_values[vol_id, edge]
+            else:
+                q[i] = Q.centroid_values[vol_id]
+
+        return q
         
 
@@ -677 +717 @@
     def check_integrity(self):
         #Mesh.check_integrity(self)
+
+        #print self.quantities
+        #print self.conserved_quantities
         
         for quantity in self.conserved_quantities:
             msg = 'Conserved quantities must be a subset of all quantities'
             assert quantity in self.quantities, msg
+
+        for quantity in self.evolved_quantities:
+            msg = 'Evolved quantities must be a subset of all quantities'
+            assert quantity in self.quantities, msg            
 
         # #assert hasattr(self, 'boundary_objects')
@@ -720 +767 @@
         self.datadir = name
 
-
+    def set_CFL(self, cfl):
+        if cfl > 1.0:
+            print 'WARNING: Setting CFL condition to %f which is greater than 1' % cfl
+        self.CFL = cfl
+
+    def get_CFL(self):
+        return self.CFL
+    
+    def set_filename(self, name):
+        self.filename = name
+
+    def get_filename(self):
+        return self.filename
+
+    def get_limiter(self):
+        return self.limiter
+
+    def set_limiter(self,limiter):
+
+        possible_limiters = \
+        ['pyvolution', 'steve_minmod', 'minmod', 'minmod_kurganov', 'superbee', 'vanleer', 'vanalbada']
+
+        if limiter in possible_limiters:
+            self.limiter = limiter
+            return
+
+        msg = '%s is an incorrect limiter type.\n'% limiter
+        msg += 'Possible types are: '+ ", ".join(["%s" % el for el in possible_limiters])
+        raise Exception, msg
+
+        
     #--------------------------
     # Main components of evolve
@@ -915 +992 @@
         """
 
-        # Save initial initial conserved quantities values
+        # Save initial conserved quantities values
         self.backup_conserved_quantities()            
 
@@ -1382 +1459 @@
             q = B.evaluate(vol_id, vertex_id)
 
-            for j, name in enumerate(self.conserved_quantities):
+            for j, name in enumerate(self.evolved_quantities):
                 Q = self.quantities[name]
                 Q.boundary_values[i] = q[j]