Changeset 8011

Timestamp:

Sep 11, 2010, 5:50:07 PM (14 years ago)

Author:

steve

Message:

Tested parallel code with new anuga interface. Seems to be working

Location:

trunk

Files:

• anuga_core/source/anuga_parallel/parallel_test.py (moved) (moved from trunk/anuga_core/source/anuga_parallel/test_parallel.py)
• anuga_core/source/anuga_parallel/pymetis/test_metis.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py (modified) (2 diffs)
• anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py (modified) (5 diffs)
• anuga_core/source/anuga_parallel/test_all.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/test_distribute_mesh.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/test_parallel_distribute_mesh.py (modified) (3 diffs)
• create_win_installer.py (modified) (1 diff)

trunk/anuga_core/source/anuga_parallel/pymetis/test_metis.py

@@ -9 +9 @@
 # path.append('..' + sep + 'pymetis')
 
-import pymetis.metis  as metis
+import anuga_parallel.pymetis.metis  as metis
 
 class TestMetis(unittest.TestCase):

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -28 +28 @@
 from anuga.utilities.util_ext        import double_precision
 from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
+        
+from anuga import Domain
+from anuga import Reflective_boundary
+from anuga import Dirichlet_boundary
+from anuga import Time_boundary
+from anuga import Transmissive_boundary
 
-from anuga.interface import Domain
-from anuga.interface import Reflective_boundary
-from anuga.interface import Dirichlet_boundary
-from anuga.interface import Time_boundary
-from anuga.interface import Transmissive_boundary
-
-from anuga.interface import rectangular_cross
-from anuga.interface import create_domain_from_file
+from anuga import rectangular_cross
+from anuga import create_domain_from_file
 
 
@@ -84 +84 @@
 domain = distribute(domain)
 
-domain.smooth = False
+#domain.smooth = False
+
+domain.set_default_order(2)
+domain.set_timestepping_method('rk2')
+domain.set_CFL(0.7)
+domain.set_beta(1.5)
+domain.set_name('meribula')
 
 #------------------------------------------------------------------------------

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

@@ -31 +31 @@
 from anuga_parallel.interface import Parallel_shallow_water_domain
 from anuga_parallel.interface import parallel_rectangle
-from anuga_parallel.interface import myid, numprocs, get_processor_name
+from anuga_parallel.interface import myid, numprocs, finalize, get_processor_name
 
 ###############################
 # Read in processor information
 ###############################
-numprocs = numprocs()
-myid     = myid()
+#numprocs = numprocs()
+#myid     = myid()
 processor_name = get_processor_name()
 
@@ -62 +62 @@
 
 
-#Boundaries
 
 
+
+
+domain.set_name('sw_rectangle')
+
+#Boundaries
 T = Transmissive_boundary(domain)
 R = Reflective_boundary(domain)
@@ -97 +101 @@
 domain.set_default_order(2)
 domain.set_timestepping_method('rk2')
+domain.set_CFL(0.7)
+domain.set_beta(1.5)
 
-print domain.get_timestepping_method()
-
+#print domain.get_timestepping_method()
 #domain.use_edge_limiter = True
 #domain.tight_slope_limiters = True
 #domain.use_centroid_velocities = False
 
-domain.CFL = 1.0
 
-domain.set_beta(0.8)
 
 
@@ -129 +132 @@
 
 
-yieldstep = 0.1
-finaltime = 1.0
+yieldstep = 0.05
+finaltime = 2.0
 
 #Check that the boundary value gets propagated to all elements
@@ -152 +155 @@
 
 if visualise: vis.join()
-pypar.finalize()
+
+finalize()

trunk/anuga_core/source/anuga_parallel/test_all.py

@@ -201 +201 @@
         test_verbose = False
     suite = regressionTest(test_verbose)
-    runner = unittest.TextTestRunner() #verbosity=2
+    runner = unittest.TextTestRunner(verbosity=2)
     runner.run(suite)
 

trunk/anuga_core/source/anuga_parallel/test_distribute_mesh.py

@@ -6 +6 @@
 
 
-from anuga.interface import Domain
-from anuga.interface import rectangular_cross
+from anuga import Domain
+from anuga import rectangular_cross
 
 from anuga_parallel.distribute_mesh import pmesh_divide_metis

trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_mesh.py

@@ -6 +6 @@
 from math import sqrt
 
-
-from anuga.interface import Domain
-from anuga.interface import rectangular_cross
+        
+from anuga import Domain
+from anuga import rectangular_cross
 
 from anuga_parallel.distribute_mesh import pmesh_divide_metis
@@ -43 +43 @@
     if not numprocs == 3: return
 
-    print numprocs
+    #print numprocs
 
     barrier()
@@ -272 +272 @@
 
     def test_distribute_three_processors(self):
-        print "Expect this test to fail if not run from the parallel directory."
+        # Expect this test to fail if not run from the parallel directory.
         result = os.system("mpirun -np 3 python test_parallel_distribute_mesh.py")
         assert_(result == 0)

trunk/create_win_installer.py

@@ -37 +37 @@
 # path to and required contents of documentation directory
 DOC_PATH = os.path.join('anuga_core', 'documentation', 'user_manual')
-DOC_FILES = ['anuga_user_manual.pfd',
+DOC_FILES = ['anuga_user_manual.pdf',
              'anuga_installation_guide.pdf',
              'anuga_whats_new.pdf']