Changeset 24902

Timestamp:

05/22/20 21:10:23 (5 years ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python translation; fixed syntax bug from previous commit.

Location:

issm/trunk-jpl/src/m

Files:

• classes/mask.py (modified) (1 diff)
• coordsystems/flaglatlongradius.py (modified) (1 diff)
• coordsystems/flagradiuselements.m (modified) (1 diff)
• coordsystems/flagradiuselements.py (added)
• geometry/planetradius.m (modified) (1 diff)
• geometry/planetradius.py (added)

issm/trunk-jpl/src/m/classes/mask.py

@@ -65 +65 @@
             self.ice_levelset[index] = -ice
         elif nargin == 1:
-            ice = *args[0]
+            ice = args[0]
             self.ocean_levelset = -ocean
         else:

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

@@ -25 +25 @@
         pass
 
-    distance = []
-    for i in range(len(long)):
-        distance[i] = math.sqrt(pow((lat[i] - lat0[i]), 2) + pow((long[i] - long0[i]), 2))
-    indices = (distance <= radius).np.nonzero() 
+    distance    = np.array(math.sqrt(pow((lat[i] - lat0[i]), 2) + pow((long[i] - long0[i]), 2)))
+    indices     = (distance <= radius).nonzero() 
 
     return indices

issm/trunk-jpl/src/m/coordsystems/flagradiuselements.m

@@ -6 +6 @@
         y0 = R .* cosd(lat0) .* sind(long0);
         z0 = R .* sind(lat0);
-
 
         distance=sqrt( (x-x0).^2+ (y-y0).^2 + (z-z0).^2);

issm/trunk-jpl/src/m/geometry/planetradius.m

@@ -6 +6 @@
 %
 %   Examples:
-%      earthradius  =planetradius('earth');
+%      earthradius=planetradius('earth');
 
 if strcmpi(planet,'earth'),