Changeset 4010

Timestamp:

06/03/10 09:42:10 (15 years ago)

Author:

jschierm

Message:

partitioner.m: Update to use new Chaco.c and Chacox.c wrappers.

File:

• issm/trunk/src/m/partition/partitioner.m (modified) (1 diff)

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

@@ -46 +46 @@
         
                 %  add integer scaled vertex weights into adjacency matrix for chaco (on diagonal)
-                adj_mat2=md.adjacency+sparse(1:size(md.adjacency,1),1:size(md.adjacency,2),floor(md.vwgt/min(md.vwgt)));
+%               adj_mat2=md.adjacency+sparse(1:size(md.adjacency,1),1:size(md.adjacency,2),floor(md.vwgt/min(md.vwgt)));
         
                 %  partition into nparts
-                part=chaco(adj_mat2,[md.x md.y],method,npart)'; 
+                part=Chaco(md.adjacency,floor(md.vwgt/min(md.vwgt)),[],[md.x md.y md.z],method,npart)'; 
         else
                 %  partition into nparts
                 method(3)=0;    %  vertex weights (0=off, 1=on)
-                part=chaco(md.adjacency,[md.x md.y],method,npart)'; 
+                part=Chaco(md.adjacency,[],[],[md.x md.y md.z],method,npart)'; 
         end
         part=part+1; %index partitions from 1 up. like metis.