Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/py3/coordsystems/ll2xy.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/py3/coordsystems/ll2xy.py (modified) (2 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/py3/coordsystems/ll2xy.py

@@ -1 @@
-import numpy as npy 
+import numpy as np 
 
 def ll2xy(lat,lon,sgn=-1,central_meridian=0,standard_parallel=71):
@@ -36 +36 @@
         ex2 = .006693883
         # Eccentricity of the Hughes ellipsoid
-        ex = npy.sqrt(ex2)
+        ex = np.sqrt(ex2)
         
-        latitude = npy.abs(lat) * npy.pi/180.
-        longitude = (lon + delta) * npy.pi/180.
+        latitude = np.abs(lat) * np.pi/180.
+        longitude = (lon + delta) * np.pi/180.
         
         # compute X and Y in grid coordinates.
-        T = npy.tan(npy.pi/4-latitude/2) / ((1-ex*npy.sin(latitude))/(1+ex*npy.sin(latitude)))**(ex/2)
+        T = np.tan(np.pi/4-latitude/2) / ((1-ex*np.sin(latitude))/(1+ex*np.sin(latitude)))**(ex/2)
         
         if (90 - slat) <  1.e-5:
-                rho = 2.*re*T/npy.sqrt((1.+ex)**(1.+ex)*(1.-ex)**(1.-ex))
+                rho = 2.*re*T/np.sqrt((1.+ex)**(1.+ex)*(1.-ex)**(1.-ex))
         else:
-                sl  = slat*npy.pi/180.
-                tc  = npy.tan(npy.pi/4.-sl/2.)/((1.-ex*npy.sin(sl))/(1.+ex*npy.sin(sl)))**(ex/2.)
-                mc  = npy.cos(sl)/npy.sqrt(1.0-ex2*(npy.sin(sl)**2))
+                sl  = slat*np.pi/180.
+                tc  = np.tan(np.pi/4.-sl/2.)/((1.-ex*np.sin(sl))/(1.+ex*np.sin(sl)))**(ex/2.)
+                mc  = np.cos(sl)/np.sqrt(1.0-ex2*(np.sin(sl)**2))
                 rho = re*mc*T/tc
         
-        y = -rho * sgn * npy.cos(sgn*longitude)
-        x =  rho * sgn * npy.sin(sgn*longitude)
+        y = -rho * sgn * np.cos(sgn*longitude)
+        x =  rho * sgn * np.sin(sgn*longitude)
 
-        cnt1=npy.nonzero(latitude>= npy.pi/2.)[0]
+        cnt1=np.nonzero(latitude>= np.pi/2.)[0]
         
         if cnt1: