Changeset 2380

Timestamp:

Feb 13, 2006, 12:35:15 PM (19 years ago)

Author:

ole

Message:

Revisited profiling, cleaned up and added setter for spatial order

Location:

inundation/pyvolution

Files:

• domain.py (modified) (3 diffs)
• run_profile.py (modified) (4 diffs)
• run_profile2.py (modified) (2 diffs)

inundation/pyvolution/domain.py

@@ -60 +60 @@
         #FIXME: Maybe have separate orders for h-limiter and w-limiter?
         #Or maybe get rid of order altogether and use beta_w and beta_h
-        self.default_order = 1
-        self.order = self.default_order
+        self.set_default_order(1)        
+        #self.default_order = 1
+        #self.order = self.default_order
+
         self.smallsteps = 0
         self.max_smallsteps = max_smallsteps
@@ -92 +94 @@
         N=self.number_of_elements
         self.already_computed_flux = zeros((N, 3), Int)
+
+
+    def set_default_order(self, n):
+        """Set default (spatial) order to either 1 or 2
+        """
+
+        msg = 'Default order must be either 1 or 2. I got %s' %n
+        assert n in [1,2], msg
+        
+        self.default_order = n
+        self.order = self.default_order
+
 
     #Public interface to Domain
@@ -197 +211 @@
 
         return self.quantities[name].get_values( location, indices = indices)
+
+    def get_quantity_object(self, name):
+        """Get object for named quantity
+
+        name: Name of quantity
+        """
+
+        return self.quantities[name]
 
 

inundation/pyvolution/run_profile.py

@@ -1 +1 @@
 """Example of shallow water wave equation.
 
-This version is for profiling
-(The original)
+This version is for profiling of timestepping
 """
 
 ######################
 # Module imports
-#
-from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
-     Transmissive_boundary, Time_boundary,\
-     Weir_simple as Weir, Constant_height
-
+from shallow_water import Domain, Reflective_boundary
 from mesh_factory import rectangular
 from Numeric import array
@@ -18 +13 @@
 ######################
 # Domain
-#
 
-N = 128
+#N = 16   #Should take less than 0.1 s
+#N = 64  #Should take less than 3s
+N = 128  #Should take less than 20s
+
 
 print 'Creating domain'
@@ -28 +25 @@
 #Create shallow water domain
 domain = Domain(points, vertices, boundary)
-domain.default_order = 2
-#domain.visualise = True
+domain.set_default_order(2)        
+domain.set_quantities_to_be_stored(None)
 
 
-print 'Field values'
+print 'Setting initial conditions'
+
 def slope(x, y):
     return -x
 
 domain.set_quantity('elevation', slope)
-domain.set_quantity('friction', 0.3)
+domain.set_quantity('friction', 0.03)
+domain.set_quantity('stage', expression = 'elevation + 0.5')
 
 
-# Boundary conditions
-#
+
+print 'Setting boundary conditions'
 Br = Reflective_boundary(domain)
 domain.set_boundary({'left': Br, 'right': Br, 'bottom': Br, 'top': Br})
 
 
-######################
-#Initial condition
-domain.set_quantity('stage', Constant_height(slope, 0.3))
-
+print 'Checking integrity'
 domain.check_integrity()
 
@@ -60 +56 @@
 
 s = 'for t in domain.evolve(yieldstep = 0.02, finaltime = 0.2): domain.write_time()'
-
 
 

inundation/pyvolution/run_profile2.py

@@ -3 +3 @@
 This version is for profiling
 (The original)
+
+
+FIXME: This should really measure something else, such as profiling the set up of domains.
 """
 
@@ -29 +32 @@
 domain = Domain(points, vertices, boundary)
 domain.default_order = 2
+domain.set_quantities_to_be_stored(None)
 #domain.visualise = True