Changeset 24185

Timestamp:

09/30/19 13:41:33 (6 years ago)

Author:

schlegel

Message:

CHG: check correctly for partition column vectors

Location:

issm/trunk-jpl/src/m/classes

Files:

• qmu.m (modified) (2 diffs)
• qmu.py (modified) (2 diffs)

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

@@ -67 +67 @@
                         end
                         if ~isempty(md.qmu.vpartition) & ~any(isnan(md.qmu.vpartition)),
-                                if numel(md.qmu.vpartition)~=md.mesh.numberofvertices  
+                                if size(md.qmu.vpartition,1)~=md.mesh.numberofvertices  
                                         md = checkmessage(md,['user supplied vertex partition for qmu analysis should have size md.mesh.numberofvertices x 1']);
                                 end
@@ -78 +78 @@
                         end
                         if ~isempty(md.qmu.epartition) & ~any(isnan(md.qmu.epartition)),
-                                if numel(md.qmu.epartition)~=md.mesh.numberofelements, 
+                                if size(md.qmu.epartition,1)~=md.mesh.numberofelements, 
                                         md = checkmessage(md,['user supplied element partition for qmu analysis should have size md.mesh.numberofelements x 1']);
                                 end

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

@@ -156 +156 @@
                 
                 if np.size(md.qmu.vpartition) > 0:
-                        if np.size(md.qmu.vpartition)!=md.mesh.numberofvertices:
+                        if np.size(md.qmu.vpartition,0)!=md.mesh.numberofvertices:
                                 md.checkmessage("user supplied vertex partition for qmu analysis should have size (md.mesh.numberofvertices x 1)")
                         if not min(md.qmu.vpartition.flatten())==0:
@@ -164 +164 @@
 
                 if np.size(md.qmu.epartition) > 0:
-                        if np.size(md.qmu.epartition) != md.mesh.numberofelements:
+                        if np.size(md.qmu.epartition,0) != md.mesh.numberofelements:
                                 md.checkmessage("user supplied element partition for qmu analysis should have size (md.mesh.numberofelements x 1)")
                         if not min(md.qmu.epartition.flatten())==0: