Changeset 8871

Timestamp:

May 20, 2013, 7:26:28 PM (11 years ago)

Author:

steve

Message:

Added some comments to boyd_box_operator

Location:

trunk/anuga_core

Files:

• compile_all.py (modified) (1 diff)
• source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (2 diffs)
• source/anuga/operators/rate_operators.py (modified) (2 diffs)
• source/anuga/operators/run_rate_spatial_operator.py (modified) (2 diffs)
• source/anuga/structures/boyd_box_operator.py (modified) (4 diffs)
• source/anuga_parallel/run_parallel_sw_merimbula.py (modified) (1 diff)
• source/anuga_validation_tests/Analytical_exact/carrier_greenspan_periodic (modified) (1 prop)
• source/anuga_validation_tests/Analytical_exact/parabolic_basin (modified) (1 prop)
• source/anuga_validation_tests/Analytical_exact/trapezoidal_channel (modified) (1 prop)
• source/anuga_validation_tests/Case_studies/Merewether/merewether.py (modified) (1 diff)
• source/anuga_validation_tests/Other_references/radial_dam_break_dry (modified) (1 prop)

trunk/anuga_core/compile_all.py

@@ -17 +17 @@
 
 # Attempt to compile all ANUGA extensions
-
 execfile('compile_all.py')
-
-#os.chdir('utilities')
-#subprocess.call([sys.executable, 'compile.py', 'quad_tree.c'])
-#subprocess.call([sys.executable, 'compile.py', 'sparse_dok.c'])
-#subprocess.call([sys.executable, 'compile.py', 'sparse_csr.c'])
-#execfile('compile_all.py')
-#
-#os.chdir('..')
-#os.chdir('advection')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('operators')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('file_conversion')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('geometry')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('structures')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('abstract_2d_finite_volumes')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('file')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('shallow_water')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#
-#os.chdir('..')
-#os.chdir('mesh_engine')
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-#
-#os.chdir('..')
-#os.chdir('fit_interpolate')
-#subprocess.call([sys.executable, '..' + os.sep + 'utilities' + os.sep + 'compile.py', 'rand48.c'])
-#subprocess.call([sys.executable, '..' + os.sep + 'utilities' + os.sep + 'compile.py', 'ptinpoly.c'])
-#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
 

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

@@ -745 +745 @@
 
                 # Brute force
-                for i in range(len(indices)):
-                    self.centroid_values[indices[i]] = values[i]
+                self.centroid_values[indices] = values
+                #for i in range(len(indices)):
+                #    self.centroid_values[indices[i]] = values[i]
         elif location == 'unique vertices':
             msg = 'Values array must be 1d'
@@ -768 +769 @@
                     self.vertex_values[:] = values
                 else:
-                    for element_index, value in map(None, indices, values):
-                        self.vertex_values[element_index] = value
+                    self.vertex_values[indices] = values
+                    #for element_index, value in map(None, indices, values):
+                    #    self.vertex_values[element_index] = value
             else:
                 msg = 'Values array must be 1d or 2d'

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

@@ -281 +281 @@
             else:
                 rate = self.get_non_spatial_rate() # rate is a scalar
+                fid = self.full_indices
                 return num.sum(self.areas[fid]*rate)*self.factor
         else:
@@ -337 +338 @@
             min_rate = num.min(rate)
             max_rate = num.max(rate)
-            message  = indent + self.label + ': Min rate = %g, Max rate = %g '% (min_rate,max_rate)
+            Q = self.get_Q()
+            message  = indent + self.label + ': Min rate = %g m/s, Max rate = %g m/s, Total Q = %g m^3/s'% (min_rate,max_rate, Q)
         else:
-            message  = indent + self.label + ': Rate = ' + str(self.get_non_spatial_rate())
+            rate = self.get_non_spatial_rate()
+            Q = self.get_Q()
+            message  = indent + self.label + ': Rate = %g m/s, Total Q = %g m^3/s' % (rate, Q)
 
 

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

@@ -141 +141 @@
     abd t a scalar
     """
-    if t<10:
+    if t<=5.0:
         return (x+y)
     else:
         return 0*x
 
+factor = 1e-3
+op3 = Rate_operator(domain, rate = rain, factor=factor)
+Q3 = numpy.sum(op3.get_spatial_rate()*domain.areas)*factor
 
-#op3 = Rate_operator(domain, rate = rain, factor=1e-3)
-area3 = numpy.sum(domain.areas)
-Q3 = numpy.sum(op3.get_rate(t)*area3)
+
+#op3()
+#domain.fractional_step_operators.remove(op3)
+
 
 #------------------------------------------------------------------------------
@@ -169 +173 @@
 
     print indent + 'Exact accumultion = ', accum
-    accum += (Q1+Q2)*yieldstep
+    dd = max(min(yieldstep,5.0-t),0.0)
+    accum += (Q1+Q2)*yieldstep + dd*Q3
 
 

trunk/anuga_core/source/anuga/structures/boyd_box_operator.py

@@ -75 +75 @@
         self.culvert_height = self.get_culvert_height()
 
+        #FIXME SR: Why is this hard coded!
         self.max_velocity = 10.0
 
@@ -90 +91 @@
 
     def discharge_routine(self):
+        """Procedure to determine the inflow and outflow inlets.
+        Then use boyd_box_function to do the actual calculation
+        """
 
         local_debug = False
 
+        # If the cuvert has been closed, then no water gets through
         if self.culvert_height <= 0.0:
             Q = 0.0
@@ -102 +107 @@
 
 
+        #  delta_total_energy will determine which inlet is inflow
         if self.use_velocity_head:
             self.delta_total_energy = \
@@ -118 +124 @@
 
 
+        # Only calculate flow if there is some water at the inflow inlet.
         if self.inflow.get_enquiry_depth() > 0.01: #this value was 0.01:
 

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -105 +105 @@
 
 if myid == 0 and verbose: print 'DISTRIBUTING DOMAIN'
-domain = distribute(domain)
+domain = distribute(domain, verbose=verbose)
 
 #--------------------------------------------------------------------------

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Merewether/merewether.py

@@ -137 +137 @@
 
 domain.sww_merge()
+
+
+finalize()