Merge branch 'wd15-issue412-pickle_comm' into develop

usnistgov · Mar 6, 2018 · 71d82e1 · 71d82e1
2 parents c4f851e + 88d3770
commit 71d82e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/fipy/meshes/nonUniformGrid2D.py b/fipy/meshes/nonUniformGrid2D.py
@@ -58,12 +58,11 @@ def __init__(self, dx=1., dy=1., nx=None, ny=None, overlap=2, communicator=paral
         builder = _NonuniformGrid2DBuilder()
 
         self.args = {
-            'dx': dx,
-            'dy': dy,
-            'nx': nx,
-            'ny': ny,
-            'overlap': overlap,
-            'communicator': communicator
+            'dx': dx, 
+            'dy': dy, 
+            'nx': nx, 
+            'ny': ny, 
+            'overlap': overlap
         }
 
         builder.buildGridData([dx, dy], [nx, ny], overlap, communicator)

diff --git a/fipy/meshes/nonUniformGrid3D.py b/fipy/meshes/nonUniformGrid3D.py
@@ -74,7 +74,6 @@ def __init__(self, dx = 1., dy = 1., dz = 1., nx = None, ny = None, nz = None, o
             'ny': ny,
             'nz': nz,
             'overlap': overlap,
-            'communicator': communicator
         }
 
         builder.buildGridData([dx, dy, dz], [nx, ny, nz], overlap,

diff --git a/fipy/meshes/uniformGrid2D.py b/fipy/meshes/uniformGrid2D.py
@@ -74,8 +74,7 @@ def __init__(self, dx=1., dy=1., nx=1, ny=1, origin=((0,),(0,)),
             'nx': nx,
             'ny': ny,
             'origin': origin,
-            'overlap': overlap,
-            'communicator': communicator
+            'overlap': overlap
         }
 
         builder.buildGridData([dx, dy], [nx, ny], overlap, communicator,

diff --git a/fipy/meshes/uniformGrid3D.py b/fipy/meshes/uniformGrid3D.py
@@ -82,8 +82,7 @@ def __init__(self, dx = 1., dy = 1., dz = 1., nx = 1, ny = 1, nz = 1,
             'ny': ny,
             'nz': nz,
             'origin': origin,
-            'overlap': overlap,
-            'communicator': communicator
+            'overlap': overlap
         }
 
         builder.buildGridData([dx, dy, dz], [nx, ny, nz], overlap,