Changeset 25132

Timestamp:

06/24/20 10:00:41 (5 years ago)

Author:

jdquinn

Message:

CHG: Adapatation of partitioner.

Location:

issm/trunk-jpl

Files:

• src/m/partition/partitioner.py (modified) (1 diff)
• test/NightlyRun/test418.py (modified) (2 diffs)

issm/trunk-jpl/src/m/partition/partitioner.py

@@ -131 +131 @@
 
     # Output
-    return part
+    return part, md

issm/trunk-jpl/test/NightlyRun/test418.py

@@ -2 +2 @@
 # this test may crash
 import numpy as np
+
+from AreaAverageOntoPartition import *
 from model import *
+from parameterize import *
+from partitioner import *
+from setflowequation import *
+from setmask import *
 from socket import gethostname
+from solve import *
 from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-from partitioner import *
-from AreaAverageOntoPartition import *
+
 
 #test partitioning, and partition averaging
 # python cannot handle resolutions greater than 30010
 md = triangle(model(), '../Exp/Square.exp', 30000.)
-#print md.mesh.numberofvertices
 md = setmask(md, '../Exp/SquareShelf.exp', '')
 md = parameterize(md, '../Par/SquareSheetShelf.py')
@@ -36 +37 @@
 # - Run valgrind and fix the above
 #
-partition = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
+partition, md = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
 
 vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(-1, 1)