Changeset 7326

Timestamp:

Aug 5, 2009, 8:32:48 PM (16 years ago)

Author:

steve

Message:

New boundary condition, transitive normal momentum, zero tangential
momentum, set stage

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/interpolate.py (modified) (1 diff)
• interface.py (modified) (1 diff)
• shallow_water/__init__.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -767 +767 @@
         # Check temporal info
         time = ensure_numeric(time)
+
         if not num.alltrue(time[1:] - time[:-1] >= 0):
             # This message is time consuming to form due to the conversion of

anuga_core/source/anuga/interface.py

@@ -14 +14 @@
 from anuga.shallow_water import Field_boundary
 from anuga.shallow_water import Transmissive_stage_zero_momentum_boundary
-from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
+from anuga.shallow_water import Transmissive_momentum_set_stage_boundary
+from anuga.shallow_water import Transmissive_n_momentum_zero_t_momentum_set_stage_boundary
 
 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Time_boundary

anuga_core/source/anuga/shallow_water/__init__.py

@@ -14 +14 @@
      Field_boundary,\
      Transmissive_stage_zero_momentum_boundary,\
+     Transmissive_n_momentum_zero_t_momentum_set_stage_boundary,\
      AWI_boundary
+     
 
 

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1285 +1285 @@
 
     ##
-    # @brief Instantiate a Reflective_boundary.
+    # @brief Instantiate a Transmissive_momentum_set_stage_boundary.
     # @param domain
     # @param function
@@ -1337 +1337 @@
 
         q[0] = x
+           
         return q
 
@@ -1353 +1354 @@
     pass
 
+
+##
+# @brief Class for a transmissive boundary.
+# @note Inherits from Boundary.
+class Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(Boundary):
+    """Returns the same normal momentum as that 
+    present in neighbour volume edge. Zero out the tangential momentum. 
+    Sets stage by specifying a function f of time which may either be a
+    vector function or a scalar function
+
+    Example:
+
+    def waveform(t):
+        return sea_level + normalized_amplitude/cosh(t-25)**2
+
+    Bts = Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(domain, waveform)
+
+    Underlying domain must be specified when boundary is instantiated
+    """
+
+    ##
+    # @brief Instantiate a Transmissive_n_momentum_zero_t_momentum_set_stage_boundary.
+    # @param domain
+    # @param function
+    def __init__(self, domain=None, function=None):
+        Boundary.__init__(self)
+
+        if domain is None:
+            msg = 'Domain must be specified for this type boundary'
+            raise Exception, msg
+
+        if function is None:
+            msg = 'Function must be specified for this type boundary'
+            raise Exception, msg
+
+        self.domain = domain
+        self.function = function
+
+    ##
+    # @brief Return a representation of this instance.
+    def __repr__(self):
+        return 'Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(%s)' %self.domain
+
+    ##
+    # @brief Calculate transmissive results.
+    # @param vol_id 
+    # @param edge_id 
+    def evaluate(self, vol_id, edge_id):
+        """Transmissive_n_momentum_zero_t_momentum_set_stage_boundary
+        return the edge momentum values of the volume they serve.
+        """
+
+        q = self.domain.get_conserved_quantities(vol_id, edge = edge_id)
+
+        normal = self.domain.get_normal(vol_id, edge_id)
+
+
+        t = self.domain.get_time()
+
+        if hasattr(self.function, 'time'):
+            # Roll boundary over if time exceeds
+            while t > self.function.time[-1]:
+                msg = 'WARNING: domain time %.2f has exceeded' % t
+                msg += 'time provided in '
+                msg += 'transmissive_momentum_set_stage_boundary object.\n'
+                msg += 'I will continue, reusing the object from t==0'
+                log.critical(msg)
+                t -= self.function.time[-1]
+
+        value = self.function(t)
+        try:
+            x = float(value)
+        except:
+            x = float(value[0])
+
+        ## import math
+        ## if vol_id == 9433:
+        ##     print 'vol_id = ',vol_id, ' edge_id = ',edge_id, 'q = ', q, ' x = ',x
+        ##     print 'normal = ', normal
+        ##     print 'n . p = ', (normal[0]*q[1] + normal[1]*q[2])
+        ##     print 't . p = ', (normal[1]*q[1] - normal[0]*q[2])
+
+
+        q[0] = x
+        ndotq = (normal[0]*q[1] + normal[1]*q[2])
+        q[1] = normal[0]*ndotq
+        q[2] = normal[1]*ndotq
+
+            
+        return q
 
 ##