Changeset 8650

Timestamp:

Nov 29, 2012, 9:47:06 AM (12 years ago)

Author:

steve

Message:

Added in a maximum_quantity which is like add_quantity to the quantity class

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• anuga/abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• anuga/shallow_water/shallow_water_domain.py (modified) (4 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -683 +683 @@
         self.set_quantity(name, Q1 + Q2)
 
+    def minimum_quantity(self, name,
+                           *args, **kwargs):
+        """min of values to a named quantity
+
+        E.g minimum_quantity('elevation', X)
+
+        Option are the same as in set_quantity.
+        """
+
+        # Do the expression stuff
+        if kwargs.has_key('expression'):
+            expression = kwargs['expression']
+            Q2 = self.create_quantity_from_expression(expression)
+        else:
+            # Create new temporary quantity
+            Q2 = Quantity(self)
+
+            # Assign specified values to temporary quantity
+            Q2.set_values(*args, **kwargs)
+
+        # MIn temporary quantity to named quantity
+        Q1 = self.get_quantity(name)
+        self.set_quantity(name, Q1.minimum(Q2))
+
+    def maximum_quantity(self, name,
+                           *args, **kwargs):
+        """max of values to a named quantity
+
+        E.g maximum_quantity('elevation', X)
+
+        Option are the same as in set_quantity.
+        """
+
+        # Do the expression stuff
+        if kwargs.has_key('expression'):
+            expression = kwargs['expression']
+            Q2 = self.create_quantity_from_expression(expression)
+        else:
+            # Create new temporary quantity
+            Q2 = Quantity(self)
+
+            # Assign specified values to temporary quantity
+            Q2.set_values(*args, **kwargs)
+
+        # Max temporary quantity to named quantity
+        Q1 = self.get_quantity(name)
+        self.set_quantity(name, Q1.maximum(Q2))
+
     def get_quantity_names(self):
         """Get a list of all the quantity names that this domain is aware of.

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -220 +220 @@
 
         return result
+
+
+
+
+
+    def maximum(self, other):
+        """Max of self with anything that could populate a quantity
+
+        E.g other can be a constant, an array, a function, another quantity
+        (except for a filename or points, attributes (for now))
+        - see set_values for details
+        """
+
+        if isinstance(other, Quantity):
+            Q = other
+        else:
+            Q = Quantity(self.domain)
+            Q.set_values(other)
+
+        result = Quantity(self.domain)
+
+        # The maximum of vertex_values, edge_values and centroid_values
+        # are calculated and assigned directly without using
+        # set_values (which calls interpolate). Otherwise
+        # edge and centroid values wouldn't be max from q1 and q2
+        result.vertex_values = num.maximum(self.vertex_values, Q.vertex_values)
+        result.edge_values = num.maximum(self.edge_values, Q.edge_values)
+        result.centroid_values = num.maximum(self.centroid_values, Q.centroid_values)
+
+        return result
+
+
+    def minimum(self, other):
+        """Max of self with anything that could populate a quantity
+
+        E.g other can be a constant, an array, a function, another quantity
+        (except for a filename or points, attributes (for now))
+        - see set_values for details
+        """
+
+        if isinstance(other, Quantity):
+            Q = other
+        else:
+            Q = Quantity(self.domain)
+            Q.set_values(other)
+
+        result = Quantity(self.domain)
+
+        # The minimum of vertex_values, edge_values and centroid_values
+        # are calculated and assigned directly without using
+        # set_values (which calls interpolate). Otherwise
+        result.vertex_values = num.minimum(self.vertex_values, Q.vertex_values)
+        result.edge_values = num.minimum(self.edge_values, Q.edge_values)
+        result.centroid_values = num.minimum(self.centroid_values, Q.centroid_values)
+
+        return result
+
 
     ############################################################################

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -523 +523 @@
             flag = str(float(str(flag))).replace(".","_")
 
-        flow_algorithms = ['1_0', '1_5', '1_75', '2_0', '2_0_limited', '2_5', 'tsunami']
+        flow_algorithms = ['1_0', '1_5', '1_75', '2_0', '2_0_limited', '2_5', 'tsunami', 'yusuke']
 
         if flag in flow_algorithms:
@@ -576 +576 @@
             self.set_timestepping_method(2)
             self.set_default_order(2)
-            beta_w      = 1.7
+            beta_w      = 1.5
             beta_w_dry  = 0.2
-            beta_uh     = 1.7
+            beta_uh     = 1.5
             beta_uh_dry = 0.2
-            beta_vh     = 1.7
+            beta_vh     = 1.5
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
@@ -606 +606 @@
 
         if self.flow_algorithm == 'tsunami':
-
             self.set_tsunami_defaults()
 
 
+        if self.flow_algorithm == 'yusuke':
+            # To speed up calculation we also turn off
+            # the update of other quantities
+            
+            self.set_tsunami_defaults()
+
+
+            
 
         if self.flow_algorithm == '2_5':
@@ -1371 +1378 @@
         """
 
+
+
+        if self.flow_algorithm == 'yusuke':
+            return
+
+        
         # The centroid values of height and x and y velocity
         # might not have been setup

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -163 +163 @@
             merge.sww_merge_parallel(global_name,self.numproc,verbose,delete_old)
 
+    def write_time(self):
+
+        if self.processor == 0:
+            Domain.write_time(self)
+
 
 # =======================================================================