Changeset 8471

Timestamp:

Jul 20, 2012, 11:08:47 AM (13 years ago)

Author:

steve

Message:

Fiddling with kinematic operator

Location:

trunk/anuga_core

Files:

• source/anuga/operators/test_kinematic_viscosity_operator.py (modified) (11 diffs)
• source/anuga/shallow_water/shallow_water_domain.py (modified) (1 diff)
• source/anuga_parallel/parallel_inlet_operator.py (modified) (2 diffs)
• validation_tests/Tests/Experimental/Okushiri/Benchmark_2.msh (modified) (previous)

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

@@ -3 +3 @@
 from anuga import Quantity
 from anuga import Dirichlet_boundary
-from kinematic_viscosity_operator import Kinematic_Viscosity_Operator
+from kinematic_viscosity_operator import Kinematic_viscosity_operator
 
 import numpy as num
@@ -9 +9 @@
 import unittest
 
-class Test_Kinematic_Viscosity(unittest.TestCase):
+class Test_kinematic_viscosity(unittest.TestCase):
     def setUp(self):
         pass
@@ -45 +45 @@
         #print domain.quantities['stage'].boundary_values
         
-        return Kinematic_Viscosity_Operator(domain)
+        return Kinematic_viscosity_operator(domain)
 
     #Second test operator class (2 triangles)
@@ -68 +68 @@
 
 
-        return Kinematic_Viscosity_Operator(domain)
+        return Kinematic_viscosity_operator(domain)
 
     def test_enumerate_boundary(self):
@@ -431 +431 @@
         b.set_boundary_values(0.0)
 
-        operator = Kinematic_Viscosity_Operator(domain)
+        operator = Kinematic_viscosity_operator(domain)
 
         n = operator.n
@@ -544 +544 @@
         b.set_boundary_values(0.0)
 
-        operator = Kinematic_Viscosity_Operator(domain)
+        operator = Kinematic_viscosity_operator(domain)
 
         dt = 0.01
@@ -608 +608 @@
         b.set_boundary_values(0.0)
 
-        kv = Kinematic_Viscosity_Operator(domain)
+        kv = Kinematic_viscosity_operator(domain)
 
         n = kv.n
@@ -658 +658 @@
         v.set_boundary_values(2.0)
 
-        kv = Kinematic_Viscosity_Operator(domain)
+        kv = Kinematic_viscosity_operator(domain)
 
 
@@ -752 +752 @@
         v.set_boundary_values(2.0)
 
-        kv = Kinematic_Viscosity_Operator(domain)
+        kv = Kinematic_viscosity_operator(domain)
 
 
@@ -818 +818 @@
         domain.set_boundary( {'left': B, 'right': B, 'top': B, 'bottom': B})
 
-        kv = Kinematic_Viscosity_Operator(domain)
+        kv = Kinematic_viscosity_operator(domain)
 
 
@@ -872 +872 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Kinematic_Viscosity, 'test')
+    suite = unittest.makeSuite(Test_kinematic_viscosity, 'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)

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

@@ -487 +487 @@
     def set_use_kinematic_viscosity(self, flag=True):
 
-        from anuga.operators.kinematic_viscosity_operator import Kinematic_Viscosity_Operator
+        from anuga.operators.kinematic_viscosity_operator import Kinematic_viscosity_operator
 
         if flag :
             # Create Operator if necessary
             if self.kv_operator is None:
-                self.kv_operator = Kinematic_Viscosity_Operator(self)
+                self.kv_operator = Kinematic_viscosity_operator(self)
         else:
             if self.kv_operator is None:

trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

@@ -88 +88 @@
         volume = 0
 
-        # Only the master proc calculates the volume
-
+        # Need to run global command on all processors
         current_volume = self.inlet.get_global_total_water_volume()
 
+        # Only the master proc calculates the update
         if self.myid == self.master_proc:
             timestep = self.domain.get_timestep()
@@ -105 +105 @@
             #print "Volume to be removed from Inlet = " + str(volume)
 
-        # Set stages evenly
+        # Set stages evenly on all processors
         self.inlet.set_stages_evenly(volume)