Changeset 26401

Timestamp:

08/18/21 15:12:36 (4 years ago)

Author:

schlegel

Message:

CHG: ll2xy python should check for arguments and not default to Antarctica

File:

• issm/trunk-jpl/src/m/coordsystems/ll2xy.py (modified) (3 diffs)

issm/trunk-jpl/src/m/coordsystems/ll2xy.py

@@ -2 +2 @@
 
 
-def ll2xy(lat, lon, sgn=-1, central_meridian=0, standard_parallel=71):
+def ll2xy(lat, lon, sgn, *args):
     """LL2XY - converts lat lon to polar stereographic
 
@@ -16 +16 @@
                                                    -1 : south latitude (default is mer = 0  lat = 71)
     """
+    assert sgn == 1 or sgn == -1, 'error: sgn should be either 1 or -1'
+         
+         # Get central_meridian and standard_parallel depending on hemisphere
+    if len(args) == 2:
+       delta = args[0]
+       slat = args[1]
+    elif len(args) == 0:
+       if sgn == 1:
+          delta = 45.
+          slat = 70.
+          print('        ll2xy: creating coordinates in north polar stereographic (Std Latitude: 70degN Meridian: 45deg)')
+       elif sgn == -1:
+          delta = 0.
+          slat = 71.
+          print('        ll2xy: creating coordinates in south polar stereographic (Std Latitude: 71degS Meridian: 0deg)')
+       else:
+          raise ValueError('sgn should be either 1 or -1')
+    else:
+       raise Exception('bad usage: type "help(ll2xy)" for details')
 
-    assert sgn == 1 or sgn == -1, 'error: sgn should be either 1 or -1'
-
-    #Get central_meridian and standard_parallel depending on hemisphere
-    if sgn == 1:
-        delta = 45
-        slat = 70
-        print('        ll2xy: creating coordinates in north polar stereographic (Std Latitude: 70N Meridian: 45)')
-    else:
-        delta = central_meridian
-        slat = standard_parallel
-        print('        ll2xy: creating coordinates in south polar stereographic (Std Latitude: 71S Meridian: 0)')
+    # if lat, lon passed as lists, convert to np.arrays
+    if type(lat) != "np.ndarray":
+       lat = np.array(lat)
+    if type(lon) != "np.ndarray":
+       lon = np.array(lon)
 
     # Conversion constant from degrees to radians
@@ -58 +71 @@
 
     if len(cnt1)>0:
-        x[cnt1, 0] = 0.0
-        y[cnt1, 0] = 0.0
+        x[cnt1] = 0.0
+        y[cnt1] = 0.0
+
     return x, y