Changeset 1428

Timestamp:

May 19, 2005, 12:47:39 PM (19 years ago)

Author:

steve

Message:

run_parallel_advection.py running in parallel (at for more than 2 processors)

Location:

inundation/ga/storm_surge

Files:

• parallel/parallel_advection.py (modified) (3 diffs)
• parallel/run_parallel_advection.py (modified) (3 diffs)
• zeus/parallel.zpi (modified) (1 diff)

inundation/ga/storm_surge/parallel/parallel_advection.py

@@ -96 +96 @@
 
                         pypar.send(Xout,send_proc)
-                        print 'Processor %d Sending to Processor %d'%(self.processor,send_proc)
+                        #print 'Processor %d Sending to Processor %d'%(self.processor,send_proc)
             else:
                 #Receive data from the iproc processor
@@ -104 +104 @@
 
                     X = pypar.receive(iproc,X)
-                    print 'Processor %d receiving from Processor %d'%(self.processor,iproc)
+                    #print 'Processor %d receiving from Processor %d'%(self.processor,iproc)
                     for i, _ in enumerate(X):
                         stage_cv[Idg[i]] = X[i]
@@ -161 +161 @@
 
 
-def parallel_rectangular(m, n, len1=1.0, len2=1.0, origin = (0.0, 0.0)):
-
-
-    """Setup a rectangular grid of triangles
-    with m+1 by n+1 grid points
-    and side lengths len1, len2. If side lengths are omitted
-    the mesh defaults to the unit square, divided between all the
-    processors
-
-    len1: x direction (left to right)
-    len2: y direction (bottom to top)
-
-    """
-
-    from config import epsilon
-    from Numeric import zeros, Float, Int
-
-    processor = pypar.rank()
-    numproc   = pypar.size()
-
-
-
-    delta1 = float(len1)/m
-    delta2 = float(len2)/n
-
-    #Calculate number of points
-    Np = (m+1)*(n+1)
-
-    class VIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return j+i*(self.n+1)
-
-    class EIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return 2*(j+i*self.n)
-
-
-    I = VIndex(n,m)
-    E = EIndex(n,m)
-
-    points = zeros( (Np,2), Float)
-
-    for i in range(m+1):
-        for j in range(n+1):
-
-            points[I(i,j),:] = [i*delta1 + origin[0], j*delta2 + origin[1]]
-
-    #Construct 2 triangles per rectangular element and assign tags to boundary
-    #Calculate number of triangles
-    Nt = 2*m*n
-
-
-    elements = zeros( (Nt,3), Int)
-    boundary = {}
-    Idgl = []
-    Xgl  = []
-    Idfl = []
-    Xfl  = []
-    Idgr = []
-    Xgr  = []
-    Idfr = []
-    Xfr  = []
-
-    full_send_dict = {}
-    ghost_recv_dict = {}
-    nt = -1
-    for i in range(m):
-        for j in range(n):
-
-            i1 = I(i,j+1)
-            i2 = I(i,j)
-            i3 = I(i+1,j+1)
-            i4 = I(i+1,j)
-
-            #Lower Element
-            nt = E(i,j)
-            if i == m-1:
-                #print 'nt =',nt
-                Idgr.append(nt)
-                Idfr.append(E(1,j))
-            if i == 0:
-                Idgl.append(nt)
-                Idfl.append(E(m-2,j))
-
-            if i == m-1:
-                boundary[nt, 2] = 'right'
-            if j == 0:
-                boundary[nt, 1] = 'bottom'
-            elements[nt,:] = [i4,i3,i2]
-
-            #Upper Element
-            nt = E(i,j)+1
-            if i == m-1:
-                Idgr.append(nt)
-                Idfr.append(E(1,j)+1)
-            if i == 0:
-                Idgl.append(nt)
-                Idfl.append(E(m-2,j)+1)
-
-            if i == 0:
-                boundary[nt, 2] = 'left'
-            if j == n-1:
-                boundary[nt, 1] = 'top'
-            elements[nt,:] = [i1,i2,i3]
-
-    Idfl = array(Idfl,Int)
-    Idgl = array(Idgl,Int)
-    Xfl  = zeros(Idfl.shape,Float)
-    Xgl  = zeros(Idgl.shape,Float)
-
-    Idfr = array(Idfr,Int)
-    Idgr = array(Idgr,Int)
-    Xfr  = zeros(Idfr.shape,Float)
-    Xgr  = zeros(Idgr.shape,Float)
-
-    #print Idf
-    #print Idg
-    full_send_dict[(processor-1)%numproc]  = [Idfl, Xfl]
-    ghost_recv_dict[(processor-1)%numproc] = [Idgl, Xgl]
-    full_send_dict[(processor+1)%numproc]  = [Idfr, Xfr]
-    ghost_recv_dict[(processor+1)%numproc] = [Idgr, Xgr]
-
-    return  points, elements, boundary, full_send_dict, ghost_recv_dict
-
-
-
-def rectangular_periodic(m, n, len1=1.0, len2=1.0, origin = (0.0, 0.0)):
-
-
-    """Setup a rectangular grid of triangles
-    with m+1 by n+1 grid points
-    and side lengths len1, len2. If side lengths are omitted
-    the mesh defaults to the unit square.
-
-    len1: x direction (left to right)
-    len2: y direction (bottom to top)
-
-    Return to lists: points and elements suitable for creating a Mesh or
-    FVMesh object, e.g. Mesh(points, elements)
-    """
-
-    from config import epsilon
-    from Numeric import zeros, Float, Int
-
-    delta1 = float(len1)/m
-    delta2 = float(len2)/n
-
-    #Calculate number of points
-    Np = (m+1)*(n+1)
-
-    class VIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return j+i*(self.n+1)
-
-    class EIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return 2*(j+i*self.n)
-
-
-    I = VIndex(n,m)
-    E = EIndex(n,m)
-
-    points = zeros( (Np,2), Float)
-
-    for i in range(m+1):
-        for j in range(n+1):
-
-            points[I(i,j),:] = [i*delta1 + origin[0], j*delta2 + origin[1]]
-
-    #Construct 2 triangles per rectangular element and assign tags to boundary
-    #Calculate number of triangles
-    Nt = 2*m*n
-
-
-    elements = zeros( (Nt,3), Int)
-    boundary = {}
-    ghosts = {}
-    nt = -1
-    for i in range(m):
-        for j in range(n):
-
-            i1 = I(i,j+1)
-            i2 = I(i,j)
-            i3 = I(i+1,j+1)
-            i4 = I(i+1,j)
-
-            #Lower Element
-            nt = E(i,j)
-            if i == m-1:
-                ghosts[nt] = E(1,j)
-            if i == 0:
-                ghosts[nt] = E(m-2,j)
-
-            if j == n-1:
-                ghosts[nt] = E(i,1)
-
-            if j == 0:
-                ghosts[nt] = E(i,n-2)
-
-            if i == m-1:
-                boundary[nt, 2] = 'right'
-            if j == 0:
-                boundary[nt, 1] = 'bottom'
-            elements[nt,:] = [i4,i3,i2]
-
-            #Upper Element
-            nt = E(i,j)+1
-            if i == m-1:
-                ghosts[nt] = E(1,j)+1
-            if i == 0:
-                ghosts[nt] = E(m-2,j)+1
-
-            if j == n-1:
-                ghosts[nt] = E(i,1)+1
-
-            if j == 0:
-                ghosts[nt] = E(i,n-2)+1
-
-            if i == 0:
-                boundary[nt, 2] = 'left'
-            if j == n-1:
-                boundary[nt, 1] = 'top'
-            elements[nt,:] = [i1,i2,i3]
-
-    #bottom left
-    nt = E(0,0)
-    nf = E(m-2,n-2)
-    ghosts[nt]   = nf
-    ghosts[nt+1] = nf+1
-
-    #bottom right
-    nt = E(m-1,0)
-    nf = E(1,n-2)
-    ghosts[nt]   = nf
-    ghosts[nt+1] = nf+1
-
-    #top left
-    nt = E(0,n-1)
-    nf = E(m-2,1)
-    ghosts[nt]   = nf
-    ghosts[nt+1] = nf+1
-
-    #top right
-    nt = E(m-1,n-1)
-    nf = E(1,1)
-    ghosts[nt]   = nf
-    ghosts[nt+1] = nf+1
-
-    return points, elements, boundary, ghosts
-
-def rectangular_periodic_lr(m, n, len1=1.0, len2=1.0, origin = (0.0, 0.0)):
-
-
-    """Setup a rectangular grid of triangles
-    with m+1 by n+1 grid points
-    and side lengths len1, len2. If side lengths are omitted
-    the mesh defaults to the unit square.
-
-    len1: x direction (left to right)
-    len2: y direction (bottom to top)
-
-    Return to lists: points and elements suitable for creating a Mesh or
-    Domain object, e.g. Mesh(points, elements)
-    """
-
-    from config import epsilon
-    from Numeric import zeros, Float, Int
-
-    delta1 = float(len1)/m
-    delta2 = float(len2)/n
-
-    #Calculate number of points
-    Np = (m+1)*(n+1)
-
-    class VIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return j+i*(self.n+1)
-
-    class EIndex:
-
-        def __init__(self, n,m):
-            self.n = n
-            self.m = m
-
-        def __call__(self, i,j):
-            return 2*(j+i*self.n)
-
-
-    I = VIndex(n,m)
-    E = EIndex(n,m)
-
-    points = zeros( (Np,2), Float)
-
-    for i in range(m+1):
-        for j in range(n+1):
-
-            points[I(i,j),:] = [i*delta1 + origin[0], j*delta2 + origin[1]]
-
-    #Construct 2 triangles per rectangular element and assign tags to boundary
-    #Calculate number of triangles
-    Nt = 2*m*n
-
-
-    elements = zeros( (Nt,3), Int)
-    boundary = {}
-    ghosts = {}
-    nt = -1
-    for i in range(m):
-        for j in range(n):
-
-            i1 = I(i,j+1)
-            i2 = I(i,j)
-            i3 = I(i+1,j+1)
-            i4 = I(i+1,j)
-
-            #Lower Element
-            nt = E(i,j)
-            if i == m-1:
-                ghosts[nt] = E(1,j)
-            if i == 0:
-                ghosts[nt] = E(m-2,j)
-
-            if i == m-1:
-                boundary[nt, 2] = 'right'
-            if j == 0:
-                boundary[nt, 1] = 'bottom'
-            elements[nt,:] = [i4,i3,i2]
-
-            #Upper Element
-            nt = E(i,j)+1
-            if i == m-1:
-                ghosts[nt] = E(1,j)+1
-            if i == 0:
-                ghosts[nt] = E(m-2,j)+1
-
-            if i == 0:
-                boundary[nt, 2] = 'left'
-            if j == n-1:
-                boundary[nt, 1] = 'top'
-            elements[nt,:] = [i1,i2,i3]
-
-
-    return points, elements, boundary, ghosts

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -8 +8 @@
 from parallel_advection import *
 from Numeric import array
+from parallel_meshes import *
 
 import pypar
@@ -17 +18 @@
 
 
-N = 30
-M = 30
+N = 20
+M = 20
 
 points, vertices, boundary, full_send_dict, ghost_recv_dict = parallel_rectangular(N, M)
@@ -56 +57 @@
 
 #Check that the boundary value gets propagated to all elements
-for t in domain.evolve(yieldstep = 0.01, finaltime = 0.02):
-    domain.write_time()
+for t in domain.evolve(yieldstep = 0.1, finaltime = 3.0):
+    if myid == 0:
+        domain.write_time()
+
+if myid == 0:
+    print 'Evolution ended'

inundation/ga/storm_surge/zeus/parallel.zpi

@@ -78 +78 @@
     <file>..\parallel\mg2ga.py</file>
     <file>..\parallel\parallel_advection.py</file>
+    <file>..\parallel\parallel_meshes.py</file>
     <file>..\parallel\run_advection.py</file>
     <file>..\parallel\run_parallel_advection.py</file>