Changeset 19535

Timestamp:

09/02/15 10:43:37 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: DO SIA LAST! Otherwise spcs might not be set up correctly (SIA should have priority)

Location:

issm/trunk-jpl/src/m/parameterization

Files:

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

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

@@ -258 +258 @@
 %Create vertices_type
 md.flowequation.vertex_equation=zeros(md.mesh.numberofvertices,1);
-pos=find(nodeonSIA);
-md.flowequation.vertex_equation(pos)=1;
 pos=find(nodeonSSA);
 md.flowequation.vertex_equation(pos)=2;
@@ -268 +266 @@
 pos=find(nodeonFS);
 md.flowequation.vertex_equation(pos)=5;
+%DO SIA LAST! Otherwise spcs might not be set up correctly (SIA should have priority)
+pos=find(nodeonSIA);
+md.flowequation.vertex_equation(pos)=1;
 if any(FSflag),
         pos=find(~nodeonFS);

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

@@ -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
@@ -256 +254 @@
         pos=numpy.nonzero(nodeonFS)
         md.flowequation.vertex_equation[pos]=5
+        #DO SIA LAST! Otherwise spcs might not be set up correctly (SIA should have priority)
+        pos=numpy.nonzero(nodeonSIA)
+        md.flowequation.vertex_equation[pos]=1
         if any(FSflag):
                 pos=numpy.nonzero(numpy.logical_not(nodeonFS))