Changeset 13052

Timestamp:

08/15/12 17:22:09 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: Echo was not displaying ncols but nrows

File:

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

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

@@ -57 +57 @@
 
         #check that each element has at least one flag
-        if not any(hutterflag+macayealflag+pattynflag+stokesflag):
-                raise TypeError("setflowequation error message: elements type not assigned, must be specified")
+        if not any(hutterflag+macayealflag+l1l2flag+pattynflag+stokesflag):
+                raise TypeError("elements type not assigned, must be specified")
 
         #check that each element has only one flag
-        if any(hutterflag+macayealflag+pattynflag+stokesflag>1):
+        if any(hutterflag+macayealflag+l1l2flag+pattynflag+stokesflag>1):
                 print "setflowequation warning message: some elements have several types, higher order type is used for them"
                 hutterflag[numpy.nonzero(numpy.logical_and(hutterflag,macayealflag))]=0
@@ -69 +69 @@
         #Check that no pattyn or stokes for 2d mesh
         if md.mesh.dimension==2:
-                if numpy.any(numpy.logical_or(stokesflag,pattynflag)):
-                        raise TypeError("setflowequation error message: stokes and pattyn elements not allowed in 2d mesh, extrude it first")
+                if numpy.any(numpy.logical_or(l1l2flag,stokesflag,pattynflag)):
+                        raise TypeError("stokes and pattyn elements not allowed in 2d mesh, extrude it first")
 
         #Stokes can only be used alone for now:
         if any(stokesflag) and any(hutterflag):
-                raise TypeError("setflowequation error message: stokes cannot be used with any other model for now, put stokes everywhere")
+                raise TypeError("stokes cannot be used with any other model for now, put stokes everywhere")
 
         #Initialize node fields
@@ -81 +81 @@
         nodeonmacayeal=numpy.zeros(md.mesh.numberofvertices)
         nodeonmacayeal[md.mesh.elements[numpy.nonzero(macayealflag),:].astype(int)-1]=1
+        nodeonl1l2=numpy.zeros(md.mesh.numberofvertices)
+        nodeonl1l2[md.mesh.elements[numpy.nonzero(l1l2flag),:].astype(int)-1]=1
         nodeonpattyn=numpy.zeros(md.mesh.numberofvertices)
         nodeonpattyn[md.mesh.elements[numpy.nonzero(pattynflag),:].astype(int)-1]=1
@@ -235 +237 @@
         md.flowequation.element_equation[numpy.nonzero(hutterflag)]=1
         md.flowequation.element_equation[numpy.nonzero(macayealflag)]=2
+        md.flowequation.element_equation[numpy.nonzero(l1l2flag)]=8
         md.flowequation.element_equation[numpy.nonzero(pattynflag)]=3
         md.flowequation.element_equation[numpy.nonzero(stokesflag)]=4
@@ -252 +255 @@
         pos=numpy.nonzero(nodeonmacayeal)
         md.flowequation.vertex_equation[pos]=2
+        pos=numpy.nonzero(nodeonl1l2)
+        md.flowequation.vertex_equation[pos]=8
         pos=numpy.nonzero(nodeonpattyn)
         md.flowequation.vertex_equation[pos]=3
-        pos=numpy.nonzero(nodeonhutter)
-        md.flowequation.vertex_equation[pos]=1
         pos=numpy.nonzero(nodeonmacayealpattyn)
         md.flowequation.vertex_equation[pos]=5
@@ -272 +275 @@
         md.flowequation.ishutter=float(any(md.flowequation.element_equation==1))
         md.flowequation.ismacayealpattyn=float(numpy.any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
+        md.flowequation.isl1l2=float(any(md.flowequation.element_equation==8))
         md.flowequation.isstokes=float(any(md.flowequation.element_equation==4))