Changeset 5536 for anuga_work/development/anuga_1d/quantity.py

Timestamp:

Jul 18, 2008, 4:37:03 PM (16 years ago)

Author:

steve

Message:

Added unit test files for quantity and shallow water

File:

• anuga_work/development/anuga_1d/quantity.py (modified) (7 diffs)

anuga_work/development/anuga_1d/quantity.py

@@ -22 +22 @@
         #from domain import Domain
         #from domain_order2 import Domain
-        from domain_t2 import Domain
+        from domain import Domain
         from Numeric import array, zeros, Float
 
@@ -56 +56 @@
         #Intialise centroid values
         self.interpolate()
+
+
+        from Numeric import zeros, Float
+        
+        #Allocate space for boundary values
+        #L = len(domain.boundary)
+        self.boundary_values = zeros(2, Float) #assumes no parrellism
+
+        #Allocate space for updates of conserved quantities by
+        #flux calculations and forcing functions
+        
+        N = domain.number_of_elements
+        self.explicit_update = zeros(N, Float )
+        self.semi_implicit_update = zeros(N, Float )
+
+        self.gradients = zeros(N, Float)
+        self.qmax = zeros(self.centroid_values.shape, Float)
+        self.qmin = zeros(self.centroid_values.shape, Float)
+
+        self.beta = domain.beta        
 
     #Methods for operator overloading
@@ -381 +401 @@
         return integral
 
-class Conserved_quantity(Quantity):
-    """Class conserved quantity adds to Quantity:
-
-    storage and method for updating, and
-    methods for extrapolation from centropid to vertices inluding
-    gradients and limiters
-    """
-
-    def __init__(self, domain, vertex_values=None):
-        Quantity.__init__(self, domain, vertex_values)
-
-        from Numeric import zeros, Float
-        
-        #Allocate space for boundary values
-        #L = len(domain.boundary)
-        self.boundary_values = zeros(2, Float) #assumes no parrellism
-
-        #Allocate space for updates of conserved quantities by
-        #flux calculations and forcing functions
-        
-        N = domain.number_of_elements
-        self.explicit_update = zeros(N, Float )
-        self.semi_implicit_update = zeros(N, Float )
-
-        self.gradients = zeros(N, Float)
-        self.qmax = zeros(self.centroid_values.shape, Float)
-        self.qmin = zeros(self.centroid_values.shape, Float)
-
-        self.beta = domain.beta
 
     def update(self, timestep):
@@ -863 +854 @@
                 else:
                     qv[k,i] = qc[k]
+    
+
+class Conserved_quantity(Quantity):
+    """Class conserved quantity adds to Quantity:
+
+    storage and method for updating, and
+    methods for extrapolation from centropid to vertices inluding
+    gradients and limiters
+    """
+
+    def __init__(self, domain, vertex_values=None):
+        Quantity.__init__(self, domain, vertex_values)
+
+        print "Use Quantity instead of Conserved_quantity"
+
                     
 
@@ -884 +890 @@
 if __name__ == "__main__":
     #from domain import Domain
-    from shallow_water_1d import Domain     
+    from shallow_water_domain import Domain     
     from Numeric import arange
     
@@ -892 +898 @@
     D1 = Domain(points1)
 
-    Q1 = Conserved_quantity(D1, vertex_values)
+    Q1 = Quantity(D1, vertex_values)
 
     print Q1.vertex_values
@@ -941 +947 @@
     D2 = Domain(points2)
 
-    Q2 = Conserved_quantity(D2)
+    Q2 = Quantity(D2)
     Q2.set_values(fun,'vertices')
     Xc = Q2.domain.vertices