Changeset 18076 for issm/trunk-jpl/src/m/parameterization/setflowequation.py

Timestamp:

05/31/14 04:47:48 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renumbering L1L2

File:

• issm/trunk-jpl/src/m/parameterization/setflowequation.py (modified) (2 diffs)

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -232 +232 @@
         md.flowequation.element_equation[numpy.nonzero(SIAflag)]=1
         md.flowequation.element_equation[numpy.nonzero(SSAflag)]=2
-        md.flowequation.element_equation[numpy.nonzero(L1L2flag)]=8
-        md.flowequation.element_equation[numpy.nonzero(HOflag)]=3
-        md.flowequation.element_equation[numpy.nonzero(FSflag)]=4
-        md.flowequation.element_equation[numpy.nonzero(SSAHOflag)]=5
-        md.flowequation.element_equation[numpy.nonzero(SSAFSflag)]=6
-        md.flowequation.element_equation[numpy.nonzero(HOFSflag)]=7
+        md.flowequation.element_equation[numpy.nonzero(L1L2flag)]=3
+        md.flowequation.element_equation[numpy.nonzero(HOflag)]=4
+        md.flowequation.element_equation[numpy.nonzero(FSflag)]=5
+        md.flowequation.element_equation[numpy.nonzero(SSAHOflag)]=6
+        md.flowequation.element_equation[numpy.nonzero(SSAFSflag)]=7
+        md.flowequation.element_equation[numpy.nonzero(HOFSflag)]=8
 
         #border
@@ -246 +246 @@
         #Create vertices_type
         md.flowequation.vertex_equation=numpy.zeros(md.mesh.numberofvertices,int)
+        pos=numpy.nonzero(nodeonSIA)
+        md.flowequation.vertex_equation[pos]=1
         pos=numpy.nonzero(nodeonSSA)
         md.flowequation.vertex_equation[pos]=2
         pos=numpy.nonzero(nodeonL1L2)
-        md.flowequation.vertex_equation[pos]=8
+        md.flowequation.vertex_equation[pos]=3
         pos=numpy.nonzero(nodeonHO)
-        md.flowequation.vertex_equation[pos]=3
-        pos=numpy.nonzero(nodeonSIA)
-        md.flowequation.vertex_equation[pos]=1
-        pos=numpy.nonzero(nodeonSSAHO)
+        md.flowequation.vertex_equation[pos]=4
+        pos=numpy.nonzero(nodeonFS)
         md.flowequation.vertex_equation[pos]=5
-        pos=numpy.nonzero(nodeonFS)
-        md.flowequation.vertex_equation[pos]=4
         if any(FSflag):
                 pos=numpy.nonzero(numpy.logical_not(nodeonFS))
                 if not (any(HOflag) or any(SSAflag)):
                         md.flowequation.vertex_equation[pos]=0
+        pos=numpy.nonzero(nodeonSSAHO)
+        md.flowequation.vertex_equation[pos]=6
         pos=numpy.nonzero(nodeonHOFS)
         md.flowequation.vertex_equation[pos]=7
         pos=numpy.nonzero(nodeonSSAFS)
-        md.flowequation.vertex_equation[pos]=6
+        md.flowequation.vertex_equation[pos]=8
 
         #figure out solution types
         md.flowequation.isSIA=any(md.flowequation.element_equation==1)
         md.flowequation.isSSA=any(md.flowequation.element_equation==2)
-        md.flowequation.isL1L2=any(md.flowequation.element_equation==8)
-        md.flowequation.isHO=any(md.flowequation.element_equation==3)
-        md.flowequation.isFS=any(md.flowequation.element_equation==4)
+        md.flowequation.isL1L2=any(md.flowequation.element_equation==3)
+        md.flowequation.isHO=any(md.flowequation.element_equation==4)
+        md.flowequation.isFS=any(md.flowequation.element_equation==5)
 
         return md