Changeset 16137 for issm/trunk/src/m/geometry/FlagElements.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/geometry/FlagElements.py (modified) (3 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/m/geometry/FlagElements.py

@@ -10 +10 @@
         FLAGELEMENTS - flag the elements in an region
 
-           The region can be given with an exp file, a list of elements.
+           The region can be given with an exp file, a list of elements or vertices
 
            Usage: 
@@ -20 +20 @@
               flag=FlagElements(md,'Domain.exp');
               flag=FlagElements(md,'~Domain.exp');
-              flag=FlagElements(md,md.mask.elementongroundedice);
         """
 
@@ -55 +54 @@
 
         elif isinstance(region,numpy.ndarray) or isinstance(region,bool):
-                if not numpy.size(region,0)==md.mesh.numberofelements:
+                if numpy.size(region,0)==md.mesh.numberofelements:
+                        flag=region
+                elif numpy.size(region,0)==md.mesh.numberofvertices:
+                        flag=(numpy.sum(region[md.mesh.elements-1]>0,axis=1)==numpy.size(md.mesh.elements,1))
+                else:
                         raise TypeError("Flaglist for region must be of same size as number of elements in model.")
-                flag=region
 
         else:

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad