Changeset 9650 for issm/trunk/src/m/model/partition/partitioner.m

Timestamp:

09/07/11 10:22:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added qmu object

File:

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

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

@@ -1 @@
-function md=partitioner(md,varargin)
+function md.qmu.partitionitioner(md,varargin)
 %PARTITIONER - partition mesh 
 %
@@ -9 +9 @@
 %   section:  1 by defaults(1=bisection, 2=quadrisection, 3=octasection)
 %   recomputeadjacency:  'on' by default (set to 'off' to compute existing one)
-%   Output: md.part recover the partition vector
+%   Output: md.qmu.partition recover the partition vector
 %   
 %   Usage:
-%      md=partitioner(md,'package','chaco','npart',100,'weighting','on');
+%      md.qmu.partitionitioner(md,'package','chaco','npart',100,'weighting','on');
 %
 
@@ -39 +39 @@
         md.numberofnodes=md.numberofnodes2d;
         md.numberofelements=md.numberofelements2d;
-        md.vwgt=[];
+        md.vertex_weight=[];
         md.nodeconnectivity=[];
 end
@@ -63 +63 @@
         %are we using weights? 
         if strcmpi(getfieldvalue(options,'weighting'),'on'),
-                weights=floor(md.vwgt/min(md.vwgt));
+                weights=floor(md.vertex_weight/min(md.vertex_weight));
                 method(3)=1;
         else 
@@ -70 +70 @@
         
         %  partition into nparts
-        part=Chaco(md.adjacency,weights,[],md.x, md.y ,md.z,method,npart,[])'+1; %index partitions from 1 up. like metis.
+        part=Chaco(md.qmu.adjacency,weights,[],md.x, md.y ,md.z,method,npart,[])'+1; %index partitions from 1 up. like metis.
 
 elseif strcmpi(package,'scotch'),
@@ -76 +76 @@
         %are we using weights? 
         if strcmpi(getfieldvalue(options,'weighting'),'on'),
-                weights=floor(md.vwgt/min(md.vwgt));
+                weights=floor(md.vertex_weight/min(md.vertex_weight));
         end
-        maptab=Scotch(md.adjacency,[],weights,[],'cmplt',[npart]);
+        maptab=Scotch(md.qmu.adjacency,[],weights,[],'cmplt',[npart]);
         
         part=maptab(:,2);%index partitions from 1 up. like metis.
@@ -89 +89 @@
 elseif strcmpi(package,'metis'),
 
-        [element_partitioning,part]=MeshPartition(md,npart);
+        [element_partitioning,part]=MeshPartition(md.qmu.numberofpartitions);
 
 else
@@ -103 +103 @@
 end
 
-md.part=part;
+md.qmu.partition=part;