Changeset 17725

Timestamp:

04/14/14 15:19:58 (11 years ago)

Author:

cborstad

Message:

NEW: project2d and DepthAverage functions in python

Location:

issm/trunk-jpl/src/m/extrusion

Files:

• DepthAverage.m (modified) (1 diff)
• DepthAverage.py (added)
• project2d.py (added)
• project3d.py (modified) (7 diffs)

issm/trunk-jpl/src/m/extrusion/DepthAverage.m

@@ -1 +1 @@
 function  vector_average=DepthAverage(md,vector)
-%DEPTHAVERAGE - computes depth average of 3d vector, and return value on 2d mesh. 
+%DEPTHAVERAGE - computes depth average of 3d vector using the trapezoidal rule, and returns the value on 2d mesh. 
 %
 %   Usage:

issm/trunk-jpl/src/m/extrusion/project3d.py

@@ -1 +1 @@
 import numpy
 from pairoptions import pairoptions
-import MatlabFuncs as m
 
 def project3d(md,*args):
@@ -16 +15 @@
               'layer' a layer number where vector should keep its values. If not specified, all layers adopt the 
                      value of the 2d vector.
-              'padding': default to 0 (value adopted by other 3d layers not being projected0
+              'padding': default to 0 (value adopted by other 3d layers not being projected
 
-           Egs:
-              extruded_vector=project3d(md,'vector',vector2d,'type','node','layer',1,'padding',NaN);
-              extruded_vector=project3d(md,'vector',vector2d,'type','element','padding',0);
-              extruded_vector=project3d(md,'vector',vector2d,'type','node');
+           Examples:
+              extruded_vector=project3d(md,'vector',vector2d,'type','node','layer',1,'padding',NaN)
+              extruded_vector=project3d(md,'vector',vector2d,'type','element','padding',0)
+              extruded_vector=project3d(md,'vector',vector2d,'type','node')
         """
 
@@ -27 +26 @@
         if not md:
                 raise TypeError("bad usage")
-        if not m.strcmp(md.mesh.elementtype(),'Penta'):
+        if md.mesh.domaintype().lower() != '3d':
                 raise TypeError("input model is not 3d")
 
@@ -33 +32 @@
         options      = pairoptions(*args)
         vector2d     = options.getfieldvalue('vector')       #mandatory
-        type         = options.getfieldvalue('type')         #mandatory
+        vectype      = options.getfieldvalue('type')         #mandatory
         layer        = options.getfieldvalue('layer',0)      #optional (do all layers otherwise)
         paddingvalue = options.getfieldvalue('padding',0)    #0 by default
@@ -40 +39 @@
         if isinstance(vector2d,numpy.ndarray) and numpy.ndim(vector2d)==1:
                 vector1d=True
-                vector2d=vector2d.reshape(numpy.size(vector2d),1)
+                vector2d=vector2d.reshape(-1,1)
 
-        if   isinstance(vector2d,(bool,int,long,float)) or numpy.size(vector2d)==1:
+        if isinstance(vector2d,(bool,int,long,float)) or numpy.size(vector2d)==1:
                 projected_vector=vector2d
 
-        elif m.strcmpi(type,'node'):
+        elif vectype.lower()=='node':
 
                 #Initialize 3d vector
-                if   numpy.size(vector2d,axis=0)==md.mesh.numberofvertices2d:
+                if vector2d.shape[0]==md.mesh.numberofvertices2d:
                         projected_vector=(paddingvalue*numpy.ones((md.mesh.numberofvertices,  numpy.size(vector2d,axis=1)))).astype(vector2d.dtype)
-                elif numpy.size(vector2d,axis=0)==md.mesh.numberofvertices2d+1:
+                elif vector2d.shape[0]==md.mesh.numberofvertices2d+1:
                         projected_vector=(paddingvalue*numpy.ones((md.mesh.numberofvertices+1,numpy.size(vector2d,axis=1)))).astype(vector2d.dtype)
                         projected_vector[-1,:]=vector2d[-1,:]
@@ -64 +63 @@
                         projected_vector[((layer-1)*md.mesh.numberofvertices2d):(layer*md.mesh.numberofvertices2d),:]=vector2d
 
-        elif m.strcmpi(type,'element'):
+        elif vectype.lower()=='element':
 
                 #Initialize 3d vector
-                if   numpy.size(vector2d,axis=0)==md.mesh.numberofelements2d:
+                if vector2d.shape[0]==md.mesh.numberofelements2d:
                         projected_vector=(paddingvalue*numpy.ones((md.mesh.numberofelements,  numpy.size(vector2d,axis=1)))).astype(vector2d.dtype)
-                elif numpy.size(vector2d,axis=0)==md.mesh.numberofelements2d+1:
+                elif vector2d.shape[0]==md.mesh.numberofelements2d+1:
                         projected_vector=(paddingvalue*numpy.ones((md.mesh.numberofelements+1,numpy.size(vector2d,axis=1)))).astype(vector2d.dtype)
                         projected_vector[-1,:]=vector2d[-1,:]
@@ -87 +86 @@
 
         if vector1d:
-                projected_vector=projected_vector.reshape((numpy.size(projected_vector)))
+                projected_vector=projected_vector.reshape(-1,)
 
         return projected_vector
-