Changeset 22758 for issm/trunk/src/m/modules/MeshPartition.m

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/modules/MeshPartition.m (modified) (2 diffs)

issm/trunk/src/m/modules/MeshPartition.m

@@ -1 @@
-function [element_partitioning, node_partitioning] = MeshPartition(md.mesh,numpartitions);
+function [element_partitioning, node_partitioning] = MeshPartition(md,numpartitions)
 %MESHPARTITION - Partition mesh according to the number of areas, using Metis library.
 %
 %          Usage:
-%                       [element_partitioning,node_partitioning]=MeshPartition(md.mesh,numpartitions)");
+%                       [element_partitioning,node_partitioning]=MeshPartition(md,numpartitions)");
 %
 %          element_partitioning: Vector of partitioning area numbers, for every element.
@@ -14 +14 @@
 end
 
+%Get mesh info from md.mesh
+numberofvertices = md.mesh.numberofvertices;
+numberofelements = md.mesh.numberofelements;
+elements         = md.mesh.elements;
+numberofelements2d = 0;
+numberofvertices2d = 0;
+numberoflayers     = 1;
+elements2d         = [];
+if isa(md.mesh,'mesh3dprisms')
+        elementtype = 'Penta';
+        numberofelements2d = md.mesh.numberofelements2d;
+        numberofvertices2d = md.mesh.numberofvertices2d;
+        numberoflayers     = md.mesh.numberoflayers;
+        elements2d         = md.mesh.elements2d;
+elseif isa(md.mesh,'mesh2d')
+        elementtype = 'Tria';
+elseif isa(md.mesh,'mesh2dvertical')
+        elementtype = 'Tria';
+end
+
 % Call mex module
-[element_partitioning, node_partitioning] = MeshPartition_matlab(md.mesh,numpartitions);
+[element_partitioning, node_partitioning] = MeshPartition_matlab(numberofvertices,elements,numberofvertices2d,elements2d,numberoflayers,meshelementtype,numpartitions);