Changeset 3579


Ignore:
Timestamp:
Sep 13, 2006, 3:50:23 PM (18 years ago)
Author:
ole
Message:

Removed all references to pyvolution in parallel code

Location:
anuga_core/source/anuga_parallel
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • anuga_core/source/anuga_parallel/build_local.py

    r3460 r3579  
    2323
    2424#########################################################
    25 # Convert the format of the data to that used by
    26 # pyvolution
     25# Convert the format of the data to that used by ANUGA
    2726#
    2827#
    … …  
    146145
    147146#########################################################
    148 # Convert the format of the data to that used by
    149 # pyvolution
     147# Convert the format of the data to that used by ANUGA
    150148#
    151149#

  • anuga_core/source/anuga_parallel/build_submesh.py

    r3514 r3579  
    1717     reshape, arrayrange, take, nonzero
    1818
    19 from anuga.pyvolution.neighbour_mesh import Mesh
     19from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
    2020
    2121

  • anuga_core/source/anuga_parallel/parallel_advection.py

    r3514 r3579  
    11import sys
    2 from os import sep
    3 sys.path.append('..'+sep+'pyvolution')
     2
    43
    54"""Class Parallel_Domain -
    … …  
    2322    pass
    2423
    25 from anuga.pyvolution.advection_vtk import *
     24from anuga.abstract_2d_finite_volumes.advection_vtk import *
    2625from Numeric import zeros, Float, Int, ones, allclose, array
    2726import pypar

  • anuga_core/source/anuga_parallel/parallel_meshes.py

    r3460 r3579  
    1 import sys
    2 from os import sep
    3 sys.path.append('..'+sep+'pyvolution')
    4 
    51"""parallel-meshes -
    622D triangular domains for parallel finite-volume computations of
    … …  
    1713"""
    1814
    19 #from parallel_advection import *
     15
     16import sys
     17from Numeric import array, zeros, Float, Int
    2018
    2119import pypar
    22 from Numeric import array
     20
     21from anuga.config import epsilon
     22
    2323
    2424def parallel_rectangle(m_g, n_g, len1_g=1.0, len2_g=1.0, origin_g = (0.0, 0.0)):
    … …  
    3535
    3636    """
    37 
    38     from config import epsilon
    39     from Numeric import zeros, Float, Int
    4037
    4138    processor = pypar.rank()
    … …  
    203200    """
    204201
    205     from config import epsilon
    206     from Numeric import zeros, Float, Int
    207 
    208202    delta1 = float(len1)/m
    209203    delta2 = float(len2)/n
    … …  
    343337    """
    344338
    345     from config import epsilon
    346     from Numeric import zeros, Float, Int
    347 
    348339    delta1 = float(len1)/m
    349340    delta2 = float(len2)/n

  • anuga_core/source/anuga_parallel/parallel_shallow_water.py

    r3557 r3579  
    1 import sys
    2 from os import sep
    3 
    4 # FIXME: This should be removed. Set evironment variable PYTHONPATH to
    5 # directory ...../anuga/inundation instead
    6 #sys.path.append('..'+sep+'pyvolution')
    7 
    81"""Class Parallel_Shallow_Water_Domain -
    922D triangular domains for finite-volume computations of
    … …  
    1811"""
    1912
     13import sys
     14
    2015import logging, logging.config
    2116logger = logging.getLogger('parallel')
    … …  
    2722    pass
    2823
    29 from anuga.pyvolution.shallow_water import *
     24from anuga.shallow_water.shallow_water_domain import *
    3025from Numeric import zeros, Float, Int, ones, allclose, array
    3126

  • anuga_core/source/anuga_parallel/run_advection.py

    r3460 r3579  
    22#pdb.set_trace()
    33
    4 import sys
    5 from os import sep
    6 sys.path.append('..'+sep+'pyvolution')
    7 
    84#========================================================================
    9 from config import g, epsilon
     5from anuga.config import g, epsilon
    106from Numeric import allclose, array, zeros, ones, Float
    11 from advection import Domain, Transmissive_boundary, Dirichlet_boundary
     7from anuga.advection import Domain, Transmissive_boundary, Dirichlet_boundary
    128from Numeric import array
    139

  • anuga_core/source/anuga_parallel/run_parallel_advection_prof.py

    r3460 r3579  
    11#!/usr/bin/env python
    2 ###
    32#########################################################
    43#
    … …  
    1413
    1514
    16 import sys
    17 from os import sep
    18 sys.path.append('..'+sep+'pyvolution')
    19 sys.path.append('..'+sep+'parallel')
    2015
    2116# Parallel communication routines

  • anuga_core/source/anuga_parallel/run_parallel_merimbula_test.py

    r3460 r3579  
    2525#
    2626#########################################################
    27 import sys
     27
    2828import pypar    # The Python-MPI interface
    2929import time
    3030
    31 
    32 from os import sep
    33 sys.path.append('..'+sep+'pyvolution')
    34 
    3531# Numeric arrays
    36 
    3732from Numeric import array, zeros, Float
    38 # pmesh
    39 
    40 #from shallow_water import Domain
    4133
    4234from print_stats import print_test_stats, build_full_flag
    4335
    44 from pmesh2domain import pmesh_to_domain_instance
    45 from advection import Domain as Advection_Domain
     36from anuga.abstract_2d_finite_volumes.pmesh2domain\
     37     import pmesh_to_domain_instance
     38from anuga.advection.advection import Domain as Advection_Domain
    4639from parallel_advection import Parallel_Domain
    4740
    48 from generic_boundary_conditions import Transmissive_boundary
     41from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     42     import Transmissive_boundary
    4943
    5044# mesh partition routines

  • anuga_core/source/anuga_parallel/run_parallel_sw_merimbula_test.py

    r3460 r3579  
    11#!/usr/bin/env python
    2 ###
    32#########################################################
    43#
    … …  
    3938import time
    4039
    41 
    42 from os import sep
    43 sys.path.append('..'+sep+'pyvolution')
    44 
    4540# Numeric arrays
    46 
    4741from Numeric import array, zeros, Float
    4842
    4943# Print debugging information
    50 
    5144from print_stats import print_test_stats, build_full_flag
    5245
    5346# pmesh
    54 
    55 from shallow_water import Domain
     47from anuga.shallow_water import Domain
    5648from parallel_shallow_water import Parallel_Domain
    57 from pmesh2domain import pmesh_to_domain_instance
     49from anuga.abstract_2d_finite_volumes.pmesh2domain\
     50     import pmesh_to_domain_instance
    5851
    5952# Reuse previous mesh import
    60 
    61 from caching import cache
     53from anuga.caching import cache
    6254
    6355# Mesh partition routines
    64 
    65 from pmesh_divide import pmesh_divide_metis
     56from pmesh_divide  import pmesh_divide_metis
    6657from build_submesh import build_submesh
    6758from build_local   import build_local_mesh
    6859from build_commun  import send_submesh, rec_submesh, extract_hostmesh
     60
    6961
    7062###############################

  • anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

    r3460 r3579  
    1414#
    1515#########################################################
    16 import sys
     16
    1717import pypar    # The Python-MPI interface
    1818import time
    19 
    20 
    21 from os import sep
    22 sys.path.append('..'+sep+'pyvolution')
    2319
    2420from Numeric import array
    … …  
    2723from print_stats import print_test_stats, build_full_flag
    2824
    29 from shallow_water import Domain
     25from anuga.shallow_water import Domain
    3026from parallel_shallow_water import Parallel_Domain
    3127
    … …  
    4541    print 'N == %d' %N
    4642
    47 points, vertices, boundary, full_send_dict, ghost_recv_dict =  \
    48     parallel_rectangle(N, M, len1_g=1.0*numprocs, len2_g = 1.0)
     43points, vertices, boundary, full_send_dict, ghost_recv_dict =\
     44        parallel_rectangle(N, M, len1_g=1.0*numprocs, len2_g = 1.0)
    4945
    5046

  • anuga_core/source/anuga_parallel/run_sw_lost_mass.py

    r3460 r3579  
    3131
    3232
    33 from os import sep
    34 sys.path.append('..'+sep+'pyvolution')
    35 
    3633from Numeric import array, zeros, Float
    37 # pmesh
    3834
    3935#from shallow_water import Domain
    4036
    41 from shallow_water import Domain
     37from anuga.shallow_water import Domain
    4238
    4339# mesh partition routines
    4440
    45 from pmesh2domain import pmesh_to_domain_instance
     41from anuga.abstract_2d_finite_volumes.pmesh2domain\
     42     import pmesh_to_domain_instance
    4643
    4744# read in the processor information

  • anuga_core/source/anuga_parallel/run_sw_lost_mass_simpler.py

    r3460 r3579  
    2323
    2424
    25 import sys
    26 from os import sep; sys.path.append('..'+sep+'pyvolution')
    27 from mesh_factory import rectangular
    28 from shallow_water import Domain, Reflective_boundary
     25from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular
     26from anuga.shallow_water import Domain, Reflective_boundary
    2927
    3028

  • anuga_core/source/anuga_parallel/test_parallel_sw.py

    r3514 r3579  
    1919
    2020from Numeric import array, zeros, Float, take, nonzero
    21 from anuga.pyvolution.shallow_water import Domain
    22 from anuga.pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
    23 from anuga.pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
     21from anuga.shallow_water import Domain
     22from anuga.shallow_water import Reflective_boundary as sw_reflective_boundary
     23from anuga.shallow_water import Transmissive_boundary as sw_transmissive_boundary
    2424from parallel_shallow_water import Parallel_Domain
    2525from parallel_shallow_water import Reflective_boundary as par_reflective_boundary
    2626from parallel_shallow_water import Transmissive_boundary as par_transmissive_boundary
    27 from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     27from anuga.abstract_2d_finite_volumes.pmesh2domain\
     28     import pmesh_to_domain_instance
     29
    2830from anuga.utilities.norms import *
    2931from anuga.utilities.util_ext import double_precision
    … …  
    4648        return self.h*((x>self.x0)&(x<self.x1))
    4749
    48 sys.path.append(".." + os.sep + "pyvolution")
    4950
    5051def parallel_test():
Note: See TracChangeset for help on using the changeset viewer.