Changeset 15527

Timestamp:

07/21/13 13:36:11 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.m (modified) (1 diff)
• flowequation.py (modified) (1 diff)

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

@@ -50 +50 @@
                                         md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]);
                                 end
-                                if ~(obj.ismacayeal || obj.ispattyn || obj.ishutter || obj.isstokes || obj.isl1l2),
+                                if ~(obj.ishutter || obj.ismacayeal || obj.isl1l2 || obj.ispattyn || obj.isstokes),
                                         md = checkmessage(md,['no element types set for this model']);
                                 end

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

@@ -67 +67 @@
                                 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
                         else:
-                                md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,7+1))
-                                md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,7+1))
-                        if not (self.ismacayeal or self.ispattyn or self.ishutter or self.isstokes or self.isl1l2):
+                                md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8))
+                                md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8))
+                        if not (self.ishutter or self.ismacayeal or self.isl1l2 or self.ispattyn or self.isstokes):
                                 md.checkmessage("no element types set for this model")