Changeset 4659

Timestamp:

07/19/10 13:53:48 (15 years ago)

Author:

Eric.Larour

Message:

Some cleanup in these routines

Location:

issm/trunk/src/m/partition

Files:

• adjacency.jschierm.m (moved) (moved from issm/trunk/src/m/partition/adjacency_matrix.m )
• part_chaco.m (deleted)
• part_scotch.m (deleted)
• partitioner.m (modified) (2 diffs)

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

@@ -27 +27 @@
 npart=getfieldvalue(options,'npart');
 
+%adjacency matrix if needed:
+if (strcmpi(package,'chaco') || strcmpi(package,'scotch')),
+        md=adjacency(md);
+end
+
+
 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]';
         method(1)=3;    %  global method (3=inertial (geometric))
-        method(3)=1;    %  vertex weights (0=off, 1=on)
+        method(3)=0;    %  vertex weights (0=off, 1=on)
         
         %specify bisection
@@ -44 +45 @@
         %are we using weights? 
         if strcmpi(getfieldvalue(options,'weighting'),'on'),
+                weights=floor(md.vwgt/min(md.vwgt));
+                method(3)=1;
+        else 
+                weights=[];
+        end
         
-                %  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)));
-        
-                %  partition into nparts
-                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, md.z,method,npart,[])'; 
-        end
-        part=part+1; %index partitions from 1 up. like metis.
+        %  partition into nparts
+        part=Chaco(md.adjacency,weights,[],md.x, md.y ,md.z,method,npart,[])'+1; %index partitions from 1 up. like metis.
 
 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]);
+        %are we using weights? 
+        if strcmpi(getfieldvalue(options,'weighting'),'on'),
+                weights=floor(md.vwgt/min(md.vwgt));
         end
+        maptab=Scotch(md.adjacency,[],weights,[],'cmplt',[npart]);
+        
+        part=maptab(:,2)+1;%index partitions from 1 up. like metis.
 
-        %  partition into 100 parts, but ignore vertex and edge weights
-        %maptab=gmap(md.adjacency,[],[],[],'cmplt',[npart],'-vm','-vs','-vt');
-        
-        if strcmpi(getfieldvalue(options,'weighting'),'on'),
-                maptab=gmap(md.adjacency,[],floor(md.vwgt/min(md.vwgt)),[],'cmplt',[npart]);
-        else
-                maptab=gmap(md.adjacency,[],[],[],'cmplt',[npart]);
-        end
-
-        part=maptab(:,2)+1;
 
 elseif strcmpi(package,'linear'),