Changeset 17488

Timestamp:

03/19/14 22:14:22 (11 years ago)

Author:

cborstad

Message:

BUG: missed a few changes after updating the import of MatlabFuncs

Location:

issm/trunk-jpl/src/m

Files:

• classes/model.py (modified) (2 diffs)
• exp/expread.py (modified) (2 diffs)
• mesh/ComputeHessian.py (modified) (3 diffs)
• parameterization/contourenvelope.py (modified) (4 diffs)
• parameterization/setmask.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model.py

@@ -42 +42 @@
 from private import private
 from EnumDefinitions import *
-from mumpsoptions import *
-from iluasmoptions import *
-from project3d import *
-from FlagElements import *
-from NodeConnectivity import *
-from ElementConnectivity import *
-from contourenvelope import *
-from PythonFuncs import *
+from mumpsoptions import mumpsoptions
+from iluasmoptions import iluasmoptions
+from project3d import project3d
+from FlagElements import FlagElements
+from NodeConnectivity import NodeConnectivity
+from ElementConnectivity import ElementConnectivity
+from contourenvelope import contourenvelope
+import MatlabFuncs as m
 #}}}
 
@@ -257 +257 @@
                         field=getattr(md1,fieldi)
                         fieldsize=numpy.shape(field)
-                        if hasattr(field,'__dict__') and not ismember(fieldi,['results'])[0]:    #recursive call
+                        if hasattr(field,'__dict__') and not m.ismember(fieldi,['results'])[0]:    #recursive call
                                 object_fields=vars(field)
                                 for fieldj in object_fields:

issm/trunk-jpl/src/m/exp/expread.py

@@ -48 +48 @@
                         break
                 A=A.split(None,1)
-                if not (len(A) == 2 and m.strcmp(A[0],'##') and strncmp(A[1],'Name:',5)):
+                if not (len(A) == 2 and m.strcmp(A[0],'##') and m.strncmp(A[1],'Name:',5)):
                         break
                 if len(A[1])>5: 
@@ -57 +57 @@
                 #Get Icon
                 A=fid.readline().split(None,1)
-                if not (len(A) == 2 and m.strcmp(A[0],'##') and strncmp(A[1],'Icon:',5)):
+                if not (len(A) == 2 and m.strcmp(A[0],'##') and m.strncmp(A[1],'Icon:',5)):
                         break
 

issm/trunk-jpl/src/m/mesh/ComputeHessian.py

@@ -38 +38 @@
 
         #compute weights that hold the volume of all the element holding the node i
-        weights=sparse(line,numpy.ones((linesize,1)),numpy.tile(areas.reshape(-1,1),(3,1)),numberofnodes,1)
+        weights=m.sparse(line,numpy.ones((linesize,1)),numpy.tile(areas.reshape(-1,1),(3,1)),numberofnodes,1)
 
         #compute field on nodes if on elements
         if numpy.size(field,axis=0)==numberofelements:
-                field=sparse(line,numpy.ones((linesize,1)),numpy.tile(areas*field,(3,1)),numberofnodes,1)/weights
+                field=m.sparse(line,numpy.ones((linesize,1)),numpy.tile(areas*field,(3,1)),numberofnodes,1)/weights
 
         #Compute gradient for each element
@@ -49 +49 @@
 
         #Compute gradient for each node (average of the elements around)
-        gradx=sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*grad_elx).reshape(-1,1),(3,1)),numberofnodes,1)
-        grady=sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*grad_ely).reshape(-1,1),(3,1)),numberofnodes,1)
+        gradx=m.sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*grad_elx).reshape(-1,1),(3,1)),numberofnodes,1)
+        grady=m.sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*grad_ely).reshape(-1,1),(3,1)),numberofnodes,1)
         gradx=gradx/weights
         grady=grady/weights
@@ -59 +59 @@
         if m.strcmpi(type,'node'):
                 #Compute Hessian on the nodes (average of the elements around)
-                hessian=numpy.hstack((sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,0]).reshape(-1,1),(3,1)),numberofnodes,1)/weights, \
-                        sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,1]).reshape(-1,1),(3,1)),numberofnodes,1)/weights, \
-                        sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,2]).reshape(-1,1),(3,1)),numberofnodes,1)/weights ))
+                hessian=numpy.hstack((m.sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,0]).reshape(-1,1),(3,1)),numberofnodes,1)/weights, \
+                        m.sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,1]).reshape(-1,1),(3,1)),numberofnodes,1)/weights, \
+                        m.sparse(line,numpy.ones((linesize,1)),numpy.tile((areas*hessian[:,2]).reshape(-1,1),(3,1)),numberofnodes,1)/weights ))
 
         return hessian

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

@@ -2 +2 @@
 import numpy
 import copy
-from NodeConnectivity import *
-from ElementConnectivity import *
+from NodeConnectivity import NodeConnectivity
+from ElementConnectivity import ElementConnectivity
 from mesh import *
+import MatlabFuncs as m
 
 def contourenvelope(md,*args):
@@ -67 +68 @@
                         elemout=numpy.nonzero(numpy.logical_not(elemin))[0]
                         mesh.elementconnectivity[elemout,:]=0
-                        mesh.elementconnectivity[numpy.nonzero(ismember(mesh.elementconnectivity,elemout+1))]=0
+                        mesh.elementconnectivity[numpy.nonzero(m.ismember(mesh.elementconnectivity,elemout+1))]=0
                 else:
                         #get flag list of elements and nodes inside the contour
@@ -80 +81 @@
                         elemout=numpy.nonzero(numpy.logical_not(elemin))[0]
                         mesh.elementconnectivity[elemout,:]=0
-                        mesh.elementconnectivity[numpy.nonzero(ismember(mesh.elementconnectivity,elemout+1))]=0
+                        mesh.elementconnectivity[numpy.nonzero(m.ismember(mesh.elementconnectivity,elemout+1))]=0
 
         #Find element on boundary
@@ -118 +119 @@
                         for j in xrange(0,3):
                                 nods=numpy.delete(nods1,j)
-                                if numpy.any(ismember(flag,nods)):
+                                if numpy.any(m.ismember(flag,nods)):
                                         segments[count,:]=[nods[0],nods[1],el1+1]
                                         ord1=numpy.nonzero(nods[0]==mesh.elements[el1,:])[0][0]

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

@@ -2 +2 @@
 import os
 from model import *
-from FlagElements import *
+from FlagElements import FlagElements
+import pairoptions
 
 def setmask(md, floatingicename, groundedicename, *args):
@@ -28 +29 @@
 
         #process options
-        options=pairoptions(*args)
+        options=pairoptions.pairoptions(*args)
 
         #Get assigned fields