Changeset 24162

Timestamp:

09/25/19 17:36:27 (6 years ago)

Author:

schlegel

Message:

CHG: add a check for column vector

Location:

issm/trunk-jpl/src/m/classes

Files:

• qmu.m (modified) (1 diff)
• qmu.py (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 & numel(md.qmu.partition)~=md.mesh.numberofelements,
+                                if (numel(md.qmu.partition)~=md.mesh.numberofvertices & numel(md.qmu.partition)~=md.mesh.numberofelements) | size(md.qmu.partition,2)~=1,
                                         md = checkmessage(md,['user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1 or md.mesh.numberofelements x 1']);
                                 end

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

@@ -153 +153 @@
                 
                 if np.size(md.qmu.partition) > 0:
-                        if np.size(md.qmu.partition)!=md.mesh.numberofvertices and np.size(md.qmu.partition) != md.mesh.numberofelements:
+                        if (np.size(md.qmu.partition)!=md.mesh.numberofvertices and np.size(md.qmu.partition) != md.mesh.numberofelements) or np.size(md.qmu.partition,1) != 1:
                                 md.checkmessage("user supplied partition for qmu analysis should have size (md.mesh.numberofvertices x 1) or (md.mesh.numberofelements x 1)")
                         if not min(md.qmu.partition.flatten())==0: