Changeset 8011


Ignore:
Timestamp:
Sep 11, 2010, 5:50:07 PM (9 years ago)
Author:
steve
Message:

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

Location:
trunk
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga_parallel/pymetis/test_metis.py

    r7487 r8011  
    99# path.append('..' + sep + 'pymetis')
    1010
    11 import pymetis.metis  as metis
     11import anuga_parallel.pymetis.metis  as metis
    1212
    1313class TestMetis(unittest.TestCase):
  • trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

    r7705 r8011  
    2828from anuga.utilities.util_ext        import double_precision
    2929from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
     30       
     31from anuga import Domain
     32from anuga import Reflective_boundary
     33from anuga import Dirichlet_boundary
     34from anuga import Time_boundary
     35from anuga import Transmissive_boundary
    3036
    31 from anuga.interface import Domain
    32 from anuga.interface import Reflective_boundary
    33 from anuga.interface import Dirichlet_boundary
    34 from anuga.interface import Time_boundary
    35 from anuga.interface import Transmissive_boundary
    36 
    37 from anuga.interface import rectangular_cross
    38 from anuga.interface import create_domain_from_file
     37from anuga import rectangular_cross
     38from anuga import create_domain_from_file
    3939
    4040
     
    8484domain = distribute(domain)
    8585
    86 domain.smooth = False
     86#domain.smooth = False
     87
     88domain.set_default_order(2)
     89domain.set_timestepping_method('rk2')
     90domain.set_CFL(0.7)
     91domain.set_beta(1.5)
     92domain.set_name('meribula')
    8793
    8894#------------------------------------------------------------------------------
  • trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

    r7877 r8011  
    3131from anuga_parallel.interface import Parallel_shallow_water_domain
    3232from anuga_parallel.interface import parallel_rectangle
    33 from anuga_parallel.interface import myid, numprocs, get_processor_name
     33from anuga_parallel.interface import myid, numprocs, finalize, get_processor_name
    3434
    3535###############################
    3636# Read in processor information
    3737###############################
    38 numprocs = numprocs()
    39 myid     = myid()
     38#numprocs = numprocs()
     39#myid     = myid()
    4040processor_name = get_processor_name()
    4141
     
    6262
    6363
    64 #Boundaries
    6564
    6665
     66
     67
     68domain.set_name('sw_rectangle')
     69
     70#Boundaries
    6771T = Transmissive_boundary(domain)
    6872R = Reflective_boundary(domain)
     
    97101domain.set_default_order(2)
    98102domain.set_timestepping_method('rk2')
     103domain.set_CFL(0.7)
     104domain.set_beta(1.5)
    99105
    100 print domain.get_timestepping_method()
    101 
     106#print domain.get_timestepping_method()
    102107#domain.use_edge_limiter = True
    103108#domain.tight_slope_limiters = True
    104109#domain.use_centroid_velocities = False
    105110
    106 domain.CFL = 1.0
    107111
    108 domain.set_beta(0.8)
    109112
    110113
     
    129132
    130133
    131 yieldstep = 0.1
    132 finaltime = 1.0
     134yieldstep = 0.05
     135finaltime = 2.0
    133136
    134137#Check that the boundary value gets propagated to all elements
     
    152155
    153156if visualise: vis.join()
    154 pypar.finalize()
     157
     158finalize()
  • trunk/anuga_core/source/anuga_parallel/test_all.py

    r7812 r8011  
    201201        test_verbose = False
    202202    suite = regressionTest(test_verbose)
    203     runner = unittest.TextTestRunner() #verbosity=2
     203    runner = unittest.TextTestRunner(verbosity=2)
    204204    runner.run(suite)
    205205
  • trunk/anuga_core/source/anuga_parallel/test_distribute_mesh.py

    r7459 r8011  
    66
    77
    8 from anuga.interface import Domain
    9 from anuga.interface import rectangular_cross
     8from anuga import Domain
     9from anuga import rectangular_cross
    1010
    1111from anuga_parallel.distribute_mesh import pmesh_divide_metis
  • trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_mesh.py

    r7562 r8011  
    66from math import sqrt
    77
    8 
    9 from anuga.interface import Domain
    10 from anuga.interface import rectangular_cross
     8       
     9from anuga import Domain
     10from anuga import rectangular_cross
    1111
    1212from anuga_parallel.distribute_mesh import pmesh_divide_metis
     
    4343    if not numprocs == 3: return
    4444
    45     print numprocs
     45    #print numprocs
    4646
    4747    barrier()
     
    272272
    273273    def test_distribute_three_processors(self):
    274         print "Expect this test to fail if not run from the parallel directory."
     274        # Expect this test to fail if not run from the parallel directory.
    275275        result = os.system("mpirun -np 3 python test_parallel_distribute_mesh.py")
    276276        assert_(result == 0)
  • trunk/create_win_installer.py

    r7902 r8011  
    3737# path to and required contents of documentation directory
    3838DOC_PATH = os.path.join('anuga_core', 'documentation', 'user_manual')
    39 DOC_FILES = ['anuga_user_manual.pfd',
     39DOC_FILES = ['anuga_user_manual.pdf',
    4040             'anuga_installation_guide.pdf',
    4141             'anuga_whats_new.pdf']
Note: See TracChangeset for help on using the changeset viewer.