source: issm/oecreview/Archive/15392-16133/ISSM-15526-15527.diff@ 16134

Last change on this file since 16134 was 16134, checked in by Mathieu Morlighem, 12 years ago

Added Archive/15392-16133

File size: 2.0 KB
RevLine 
[16134]1Index: ../trunk-jpl/src/m/classes/flowequation.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/flowequation.py (revision 15526)
4+++ ../trunk-jpl/src/m/classes/flowequation.py (revision 15527)
5@@ -66,9 +66,9 @@
6 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2])
7 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
8 else:
9- md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,7+1))
10- md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,7+1))
11- if not (self.ismacayeal or self.ispattyn or self.ishutter or self.isstokes or self.isl1l2):
12+ md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8))
13+ md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8))
14+ if not (self.ishutter or self.ismacayeal or self.isl1l2 or self.ispattyn or self.isstokes):
15 md.checkmessage("no element types set for this model")
16
17 if DiagnosticHutterAnalysisEnum() in analyses:
18Index: ../trunk-jpl/src/m/classes/flowequation.m
19===================================================================
20--- ../trunk-jpl/src/m/classes/flowequation.m (revision 15526)
21+++ ../trunk-jpl/src/m/classes/flowequation.m (revision 15527)
22@@ -49,7 +49,7 @@
23 md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices 1],'values',[0:8]);
24 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements 1],'values',[0:8]);
25 end
26- if ~(obj.ismacayeal || obj.ispattyn || obj.ishutter || obj.isstokes || obj.isl1l2),
27+ if ~(obj.ishutter || obj.ismacayeal || obj.isl1l2 || obj.ispattyn || obj.isstokes),
28 md = checkmessage(md,['no element types set for this model']);
29 end
30 end
Note: See TracBrowser for help on using the repository browser.