Changeset 8114


Ignore:
Timestamp:
Jan 25, 2011, 2:45:50 PM (13 years ago)
Author:
jakeman
Message:

jakeman: fixed parallel version so that it can be run using a file_boundary based upon an .sts file. Added the unit test - test_parallel_file_boundary.py

Location:
trunk/anuga_core/source/anuga_parallel
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga_parallel/parallel_api.py

    r7449 r8114  
    124124                             ghost_recv_dict=ghost_recv_dict,
    125125                             number_of_full_nodes=number_of_full_nodes,
    126                              number_of_full_triangles=number_of_full_triangles)
     126                             number_of_full_triangles=number_of_full_triangles,
     127                             geo_reference=georef) ## jj added this
    127128
    128129    #------------------------------------------------------------------------
  • trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

    r8107 r8114  
    2727                 ghost_recv_dict=None,
    2828                 number_of_full_nodes=None,
    29                  number_of_full_triangles=None):
     29                 number_of_full_triangles=None,
     30                 geo_reference=None): #jj added this
    3031
    3132        Domain.__init__(self,
     
    3839                        numproc=pypar.size(),
    3940                        number_of_full_nodes=number_of_full_nodes,
    40                         number_of_full_triangles=number_of_full_triangles)
     41                        number_of_full_triangles=number_of_full_triangles,
     42                        geo_reference=geo_reference) #jj added this
    4143
    4244 
  • trunk/anuga_core/source/anuga_parallel/test_parallel_sw_flow.py

    r7811 r8114  
    9090    #
    9191    # Sometimes the interpolation points sit exactly
    92     # between to centroids, so in the parallel run we
     92    # between two centroids, so in the parallel run we
    9393    # reset the interpolation points to the centroids
    9494    # found in the sequential run
    9595    #------------------------------------------------------------------------------
    9696    interpolation_points = [[0.4,0.5], [0.6,0.5], [0.8,0.5], [0.9,0.5]]
    97 
    98     if parallel:
    99         interpolation_points = seq_interpolation_points
    10097
    10198
     
    118115    if verbose: print 'P%d has points = %s' %(myid, tri_ids)
    119116
    120     if not parallel:
    121         c_coord = domain.get_centroid_coordinates()
    122         interpolation_points = []
    123         for id in tri_ids:
    124             if id<1:
    125                 print 'ERROR: All interpolation points be within the sequential domain!'
    126             interpolation_points.append(c_coord[id,:])
     117
     118    c_coord = domain.get_centroid_coordinates()
     119    interpolation_points = []
     120    for id in tri_ids:
     121        if id<1:
     122            print 'ERROR: All interpolation points be within the sequential domain!'
     123        interpolation_points.append(c_coord[id,:])
    127124           
    128125    #------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.