Changeset 8475

Timestamp:

Jul 23, 2012, 11:47:26 AM (13 years ago)

Author:

steve

Message:

Changing names to elevation

Location:

trunk/anuga_core/source/anuga/operators

Files:

• run_set_elevation.py (moved) (moved from trunk/anuga_core/source/anuga/operators/run_set_bed.py) (3 diffs)
• run_set_stage.py (modified) (2 diffs)
• set_elevation_operators.py (moved) (moved from trunk/anuga_core/source/anuga/operators/set_bed_operators.py) (14 diffs)
• set_stage_operators.py (moved) (moved from trunk/anuga_core/source/anuga/operators/set_value_operators.py)

trunk/anuga_core/source/anuga/operators/run_set_elevation.py

@@ -30 +30 @@
 
 
-output_file = 'set_stage'
+output_file = 'set_bed'
 domain.set_name(output_file)                
 
@@ -58 +58 @@
 # Setup Operators
 #------------------------------------------------------------------------------
-from anuga.operators.set_value_operators import Circular_set_stage_operator
+from anuga.operators.set_bed_operators import Circular_set_bed_operator
 
 import math
 
-stage1 = lambda t: h0 + 20.0 * math.sin(t/3.0)
-cop1 = Circular_set_stage_operator(domain, stage=stage1, center=(0.0, 0.0), radius=100.0 )
+bed1 = lambda t: 20.0 * math.sin(t/3.0)
+cop1 = Circular_set_bed_operator(domain, bed=bed1, center=(0.0, 0.0), radius=100.0 )
 
-stage2 = lambda t: h0 + 30.0 * math.sin(t/6.0)
-cop2 = Circular_set_stage_operator(domain, stage=stage2, center=(2000.0, 1000.0), radius=100.0 )
+#stage2 = lambda t: h0 + 30.0 * math.sin(t/6.0)
+#cop2 = Circular_set_stage_operator(domain, stage=stage2, center=(2000.0, 1000.0), radius=100.0 )
 
 #print cop1.statistics()
@@ -75 +75 @@
 #------------------------------------------------------------------------------
 
-for t in domain.evolve(yieldstep = 1.0, finaltime = 120.0):
+for t in domain.evolve(yieldstep = 1.0, finaltime = 20.0):
     #print domain.timestepping_statistics(track_speeds=True)
     domain.print_timestepping_statistics()

trunk/anuga_core/source/anuga/operators/run_set_stage.py

@@ -58 +58 @@
 # Setup Operators
 #------------------------------------------------------------------------------
-from anuga.operators.set_value_operators import Circular_set_stage_operator
+from anuga.operators.set_stage_operators import Circular_set_stage_operator
 
 import math
@@ -75 +75 @@
 #------------------------------------------------------------------------------
 
-for t in domain.evolve(yieldstep = 1.0, finaltime = 120.0):
+for t in domain.evolve(yieldstep = 1.0, finaltime = 20.0):
     #print domain.timestepping_statistics(track_speeds=True)
     domain.print_timestepping_statistics()

trunk/anuga_core/source/anuga/operators/set_elevation_operators.py

@@ -1 +1 @@
 """
-Set bed operators
+Set elevation operators
 
 
@@ -23 +23 @@
 
 
-class Set_bed_operator(Operator):
-    """
-    Set the bed in a region (careful to maintain continuitiy of bed)
+class Set_elevation_operator(Operator):
+    """
+    Set the elevation in a region (careful to maintain continuitiy of elevation)
 
     indices: None == all triangles, Empty list [] no triangles
@@ -35 +35 @@
     def __init__(self,
                  domain,
-                 bed=None,
+                 elevation=None,
                  indices=None,
                  description = None,
@@ -48 +48 @@
         # Local variables
         #------------------------------------------
-        self.bed = bed
+        self.elevation = elevation
         self.indices = indices
 
@@ -64 +64 @@
             return
 
-        bed = self.get_bed()
+        elevation = self.get_elevation()
 
         if self.verbose is True:
             log.critical('Bed of %s at time = %.2f = %f'
-                         % (self.quantity_name, domain.get_time(), bed))
+                         % (self.quantity_name, domain.get_time(), elevation))
 
         if self.indices is None:
-            self.bed_c[:] = bed
+            self.elevation_c[:] = elevation
         else:
-            self.bed_c[self.indices] = bed
-
-
-    def get_bed(self, t=None):
-        """Get value of bed at time t.
-        If t not specified, return bed at current domain time
+            self.elevation_c[self.indices] = elevation
+
+
+    def get_elevation(self, t=None):
+        """Get value of elevation at time t.
+        If t not specified, return elevation at current domain time
         """
 
@@ -84 +84 @@
             t = self.domain.get_time()
 
-        if callable(self.bed):
+        if callable(self.elevation):
             try:
-                stage = self.bed(t)
+                elevation = self.elevation(t)
             except Modeltime_too_early, e:
                 raise Modeltime_too_early(e)
@@ -95 +95 @@
                 raise Modeltime_too_late(msg)
         else:
-            bed = self.bed
-
-
-        if bed is None:
-            msg = ('Attribute bed must be specified in '+self.__name__+
+            elevation = self.elevation
+
+
+        if elevation is None:
+            msg = ('Attribute elevation must be specified in '+self.__name__+
                    ' before attempting to call it')
             raise Exception(msg)
 
-        return bed
+        return elevation
 
 
@@ -115 +115 @@
     def statistics(self):
 
-        message = self.label + ': Set_bed_operator'
+        message = self.label + ': Set_elevation_operator'
         message = message + ' on triangles '+ str(self.indices)
         return message
@@ -122 +122 @@
     def timestepping_statistics(self):
 
-        message  = indent + self.label + ': Set_bed = ' + str(self.get_bed())
+        message  = indent + self.label + ': Set_elevation = ' + str(self.get_elevation())
         message  += ' at center '+str(self.center)
         return message
@@ -132 +132 @@
 # Specific Bed Operators for circular region.
 #===============================================================================
-class Circular_set_bed_operator(Set_bed_operator):
-    """
-    Set bed over a circular region
+class Circular_set_elevation_operator(Set_elevation_operator):
+    """
+    Set elevation over a circular region
 
     """
 
     def __init__(self, domain,
-                 bed=0.0,
+                 elevation=0.0,
                  center=None,
                  radius=None,
@@ -180 +180 @@
 
 
-        Set_bed_operator.__init__(self,
+        Set_elevation_operator.__init__(self,
                                     domain,
-                                    bed=bed,
+                                    elevation=elevation,
                                     indices=indices,
                                     verbose=verbose)
@@ -193 +193 @@
 # Specific Bed Operators for polygonal region.
 #===============================================================================
-class Polygonal_set_stage_operator(Set_stage_operator):
+class Polygonal_set_elevation_operator(Set_elevation_operator):
     """
     Add water at certain rate (ms^{-1} = vol/Area/sec) over a
@@ -203 +203 @@
 
     def __init__(self, domain,
-                 bed=0.0,
+                 elevation=0.0,
                  polygon=None,
                  verbose=False):
@@ -220 +220 @@
 
 
-        Set_bed_operator.__init__(self,
+        Set_elevation_operator.__init__(self,
                                domain,
-                               bed=bed,
+                               elevation=elevation,
                                indices=indices,
                                verbose=verbose)