Changeset 8585

Timestamp:

Sep 18, 2012, 5:22:47 PM (13 years ago)

Author:

steve

Message:

Added in get_minimum_allowed_height to domain

Location:

trunk/anuga_core/source

Files:

• anuga/shallow_water/shallow_water_domain.py (modified) (2 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (3 diffs)
• anuga_parallel/run_parallel_sw_rectangular_tsunami.py (modified) (2 diffs)

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

@@ -770 +770 @@
         self.minimum_storable_height = minimum_storable_height
 
+
+    def get_minimum_storable_height(self):
+
+        return self.minimum_storable_height
+
+
     def set_minimum_allowed_height(self, minimum_allowed_height):
         """Set minimum depth that will be recognised in the numerical scheme.
@@ -787 +793 @@
         self.minimum_allowed_height = minimum_allowed_height
         self.H0 = minimum_allowed_height
+
+
+
+    def get_minimum_allowed_height(self):
+
+        return self.minimum_allowed_height
 
     def set_maximum_allowed_speed(self, maximum_allowed_speed):

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -36 +36 @@
                  number_of_full_triangles=None,
                  geo_reference=None,
+                 processor = None,
+                 numproc = None,
                  number_of_global_triangles=None, ## SR added this
                  number_of_global_nodes= None, ## SR added this
@@ -42 +44 @@
                  tri_l2g = None, ## SR added this
                  node_l2g = None, #): ## SR added this
-                 ghost_layer_width = 2):
+                 ghost_layer_width = 2): ## SR added this
+
+
+
+        #-----------------------------------------
+        # Sometimes we want to manually
+        # create instances of the parallel_domain
+        # otherwise ...
+        #----------------------------------------
+        if processor is None:
+            processor = pypar.rank()
+        if numproc is None:
+            numproc = pypar.size()
 
         Domain.__init__(self,
@@ -50 +64 @@
                         full_send_dict=full_send_dict,
                         ghost_recv_dict=ghost_recv_dict,
-                        processor=pypar.rank(),
-                        numproc=pypar.size(),
+                        processor=processor,
+                        numproc=numproc,
                         number_of_full_nodes=number_of_full_nodes,
                         number_of_full_triangles=number_of_full_triangles,

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangular_tsunami.py

@@ -63 +63 @@
                                               len1=length, len2=width, verbose=verbose)
 
+    #---------------------------------------
+    # Add these two commands to use Gareth's
+    # tsunami algorithm. Play with the 
+    # minimum allowed height to remove possible 
+    # unrealistic large velocities
+    #---------------------------------------
+    domain.set_flow_algorithm('tsunami')
+    domain.set_minimum_allowed_height(0.01)
+
     domain.set_store(True)
-    domain.set_minimum_allowed_height(0.01)
     domain.set_quantity('elevation',topography)     # Use function for elevation
     domain.get_quantity('elevation').smooth_vertex_values()
@@ -70 +78 @@
     domain.set_quantity('stage', stagefun)          # Constant negative initial stage
     domain.get_quantity('stage').smooth_vertex_values()
-    domain.set_flow_algorithm('tsunami')
+
     domain.set_name('rectangular_tsunami')
-    domain.set_minimum_allowed_height(0.01)
+
     domain.print_statistics()
 else: