Changeset 3921

Timestamp:

05/24/10 14:15:22 (15 years ago)

Author:

jschierm

Message:

partitioner.m: Add adjacency matrix creation if none exists, and update return arguments from Scotch.

File:

• issm/trunk/src/m/partition/partitioner.m (modified) (2 diffs)

issm/trunk/src/m/partition/partitioner.m

@@ -29 +29 @@
 if strcmpi(package,'chaco'),
 
+        %  create adjacency matrix, vertex list, and vertex weights
+        if isempty(md.adjacency)
+                [md.adjacency,vlist,md.vwgt]=adjacency_matrix(md.elements,[md.x md.y md.z]);
+        end
+
         %  default method (from chaco.m)
         method=[1 1 0 0 1 1 50 0 .001 7654321];
@@ -54 +59 @@
 elseif strcmpi(package,'scotch'),
 
+        %  create adjacency matrix, vertex list, and vertex weights
+        if isempty(md.adjacency)
+                [md.adjacency,vlist,md.vwgt]=adjacency_matrix(md.elements,[md.x md.y md.z]);
+        end
+
         %  partition into 100 parts, but ignore vertex and edge weights
-        %[status,maptab]=gmap(md.adjacency,[],[],[],'cmplt',[npart],'-vm','-vs','-vt');
+        %maptab=gmap(md.adjacency,[],[],[],'cmplt',[npart],'-vm','-vs','-vt');
         
         if strcmpi(getfieldvalue(options,'weighting'),'on'),
-                [status,maptab]=gmap(md.adjacency,[],floor(md.vwgt/min(md.vwgt)),[],'cmplt',[npart]);
+                maptab=gmap(md.adjacency,[],floor(md.vwgt/min(md.vwgt)),[],'cmplt',[npart]);
         else
-                [status,maptab]=gmap(md.adjacency,[],[],[],'cmplt',[npart]);
+                maptab=gmap(md.adjacency,[],[],[],'cmplt',[npart]);
         end