Changeset 22069

Timestamp:

09/12/17 15:18:30 (8 years ago)

Author:

schlegel

Message:

CHG: allow dakota to sample element vectors

Location:

issm/trunk-jpl/src

Files:

• m/classes/qmu.m (modified) (1 diff)
• m/modules/MeshPartition.m (modified) (1 diff)
• m/partition/partitioner.m (modified) (1 diff)
• wrappers/MeshPartition/MeshPartition.cpp (modified) (1 diff)

issm/trunk-jpl/src/m/classes/qmu.m

@@ -65 +65 @@
                         end
                         if ~isempty(md.qmu.partition),
-                                if numel(md.qmu.partition)~=md.mesh.numberofvertices,
-                                        md = checkmessage(md,['user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1 ']);
+                                if numel(md.qmu.partition)~=md.mesh.numberofvertices & numel(md.qmu.partition)~=md.mesh.numberofelements,
+                                        md = checkmessage(md,['user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1 or md.mesh.numberofelements x 1']);
                                 end
                                 if min(md.qmu.partition)~=0,

issm/trunk-jpl/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.
 %

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

@@ -90 +90 @@
 elseif strcmpi(package,'linear'),
 
-        part=1:1:md.mesh.numberofvertices;
+        if npart==md.mesh.numberofelements | md.qmu.numberofpartitions==md.mesh.numberofelements
+                part=1:1:md.mesh.numberofelements;
+                disp('Linear partitioner requesting partitions on elements');
+        else
+                part=1:1:md.mesh.numberofvertices;
+        end
 
 elseif strcmpi(package,'metis'),
 
-        [element_partitioning,part]=MeshPartition(md.mesh,md.qmu.numberofpartitions);
+        [element_partitioning,part]=MeshPartition(md,md.qmu.numberofpartitions);
 
 else

issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp

@@ -56 +56 @@
                 FetchData(&numberoflayers,mxGetAssignedField(MESH,0,"numberoflayers"));
         }
-        else if(strcmp(mxGetClassName(MESH),"mesh2dhorizontal")==0){
+        else if(strcmp(mxGetClassName(MESH),"mesh2d")==0){
                 meshelementtype = TriaEnum;
                 numberoflayers=1;