Changeset 24901

Timestamp:

05/22/20 20:01:40 (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) (2 diffs)
• coordsystems/flaglatlongradius.m (modified) (2 diffs)
• coordsystems/flaglatlongradius.py (added)

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

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

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

@@ -1 @@
-function indices=flaglatlongradius(lat,long,lat0,long0,radius)
+function indices=flaglatlongradius(lat,long,lat0,long0,radius) % {{{
 %FLAGLATLONGRADIUS - given a vector of lat,long, and a circle of radius degrees around lat0,long0, 
 %                    return the indices into lat,long that are within this circle. 
-%                    lat and long should be between -90 and 90, and -180 and +180 respectively. 
+%                    lat and long should be between -90 and 90, and -180 and +180 respectively.
 
-        distance=sqrt( (lat-lat0).^2+ (long-long0).^2);
-        
         %three cases, depending on whether our circle goes past the -180 +180 longitude line: 
         if (long0-radius)<=-180,
@@ -15 +13 @@
         distance=sqrt( (lat-lat0).^2+ (long-long0).^2);
         indices=find(distance<=radius);
+% }}}