Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/xy2ll.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/xy2ll.py (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/xy2ll.py

@@ -1 @@
-import numpy as npy
+import numpy as  np
 from math import pi
 
@@ -37 +37 @@
                 raise StandardError('bad usage: type "help(xy2ll)" for details')
 
-        # if x,y passed as lists, convert to numpy arrays
-        if type(x) != "numpy.ndarray":
-                x=npy.array(x)
-        if type(y) != "numpy.ndarray":
-                y=npy.array(y)
+        # if x,y passed as lists, convert to np.arrays
+        if type(x) != "np.ndarray":
+                x=np.array(x)
+        if type(y) != "np.ndarray":
+                y=np.array(y)
 
         ## Conversion constant from degrees to radians
@@ -50 +50 @@
         ex2 = .006693883
         ## Eccentricity of the Hughes ellipsoid
-        ex = npy.sqrt(ex2)
+        ex = np.sqrt(ex2)
         
         sl = slat*pi/180.
-        rho = npy.sqrt(x**2 + y**2)
-        cm = npy.cos(sl) / npy.sqrt(1.0 - ex2 * (npy.sin(sl)**2))
-        T = npy.tan((pi/4.0) - (sl/2.0)) / ((1.0 - ex*npy.sin(sl)) / (1.0 + ex*npy.sin(sl)))**(ex / 2.0)
+        rho = np.sqrt(x**2 + y**2)
+        cm = np.cos(sl) / np.sqrt(1.0 - ex2 * (np.sin(sl)**2))
+        T = np.tan((pi/4.0) - (sl/2.0)) / ((1.0 - ex*np.sin(sl)) / (1.0 + ex*np.sin(sl)))**(ex / 2.0)
         
         if abs(slat-90.) < 1.e-5:
-                T = rho*npy.sqrt((1. + ex)**(1. + ex) * (1. - ex)**(1. - ex)) / 2. / re
+                T = rho*np.sqrt((1. + ex)**(1. + ex) * (1. - ex)**(1. - ex)) / 2. / re
         else:
                 T = rho * T / (re * cm)
         
-        chi = (pi / 2.0) - 2.0 * npy.arctan(T)
+        chi = (pi / 2.0) - 2.0 * np.arctan(T)
         lat = chi + ((ex2 / 2.0) + (5.0 * ex2**2.0 / 24.0) + (ex2**3.0 / 12.0)) * \
-                npy.sin(2 * chi) + ((7.0 * ex2**2.0 / 48.0) + (29.0 * ex2**3 / 240.0)) * \
-                npy.sin(4.0 * chi) + (7.0 * ex2**3.0 / 120.0) * npy.sin(6.0 * chi) 
+                np.sin(2 * chi) + ((7.0 * ex2**2.0 / 48.0) + (29.0 * ex2**3 / 240.0)) * \
+                np.sin(4.0 * chi) + (7.0 * ex2**3.0 / 120.0) * np.sin(6.0 * chi) 
         
         lat = sgn * lat
-        lon = npy.arctan2(sgn * x,-sgn * y)
+        lon = np.arctan2(sgn * x,-sgn * y)
         lon = sgn * lon
         
-        res1 = npy.nonzero(rho <= 0.1)[0]
+        res1 = np.nonzero(rho <= 0.1)[0]
         if len(res1) > 0:
                 lat[res1] = 90. * sgn