Ignore:
Timestamp:
06/07/17 10:50:54 (8 years ago)
Author:
Eric.Larour
Message:

CHG: merged branch back to trunk-jpl 21754.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-larour-NatGeoScience2016/src/py3/geometry/slope.py

    r19895 r21759  
    1 import numpy as npy
     1import numpy as np
    22from GetNodalFunctionsCoeff import  GetNodalFunctionsCoeff
    33
    … …  
    3333        alpha,beta=GetNodalFunctionsCoeff(index,x,y)[0:2]
    3434
    35         summation=npy.array([[1],[1],[1]])
    36         sx=npy.dot(surf[index-1]*alpha,summation).reshape(-1,)
    37         sy=npy.dot(surf[index-1]*beta,summation).reshape(-1,)
     35        summation=np.array([[1],[1],[1]])
     36        sx=np.dot(surf[index-1]*alpha,summation).reshape(-1,)
     37        sy=np.dot(surf[index-1]*beta,summation).reshape(-1,)
    3838
    39         s=npy.sqrt(sx**2+sy**2)
     39        s=np.sqrt(sx**2+sy**2)
    4040
    4141        if md.mesh.dimension()==3:
    4242                sx=project3d(md,'vector',sx,'type','element')
    4343                sy=project3d(md,'vector',sy,'type','element')
    44                 s=npy.sqrt(sx**2+sy**2)
     44                s=np.sqrt(sx**2+sy**2)
    4545
    4646        return (sx,sy,s)
Note: See TracChangeset for help on using the changeset viewer.