Changeset 24897

Timestamp:

05/22/20 17:21:51 (5 years ago)

Author:

jdquinn

Message:

BUG: MATLAB doesn’t like reuse of name “counter”.

Location:

issm/trunk-jpl/src/m/classes

Files:

• mesh3dsurface.m (modified) (1 diff)
• mesh3dsurface.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/mesh3dsurface.m

@@ -213 +213 @@
                                 end
                         elseif strcmpi(geometry,'line'),
-                                counter=1;
+                                count=1;
                                 for i=1:self.numberofelements,
                                         el=self.elements(i,:);
                                         %first line:
-                                        contours(counter).x = [self.long(el(1)) self.long(el(2))];
-                                        contours(counter).y = [self.lat(el(1)) self.lat(el(2))];
-                                        contours(counter).Geometry = 'Line';
+                                        contours(count).x = [self.long(el(1)) self.long(el(2))];
+                                        contours(count).y = [self.lat(el(1)) self.lat(el(2))];
+                                        contours(count).Geometry = 'Line';
 
                                         %second line:
-                                        contours(counter+1).x = [self.long(el(2)) self.long(el(3))];
-                                        contours(counter+1).y = [self.lat(el(2)) self.lat(el(3))];
-                                        contours(counter+1).Geometry = 'Line';
+                                        contours(count+1).x = [self.long(el(2)) self.long(el(3))];
+                                        contours(count+1).y = [self.lat(el(2)) self.lat(el(3))];
+                                        contours(count+1).Geometry = 'Line';
 
                                         %third line:
-                                        contours(counter+2).x = [self.long(el(3)) self.long(el(1))];
-                                        contours(counter+2).y = [self.lat(el(3)) self.lat(el(1))];
-                                        contours(counter+2).Geometry = 'Line';
+                                        contours(count+2).x = [self.long(el(3)) self.long(el(1))];
+                                        contours(count+2).y = [self.lat(el(3)) self.lat(el(1))];
+                                        contours(count+2).Geometry = 'Line';
                                         
-                                        %increase counter: 
-                                        counter += 3;
+                                        %increase count: 
+                                        count += 3;
                                 end
                         elseif strcmpi(geometry,'polygon'),

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

@@ -218 +218 @@
                 contours[i]         = contour
         elif geometry == 'line':
-            counter = 0
+            count = 0
             for i in range(len(self.numberofelements)): 
                 el = self.elements[i]
@@ -227 +227 @@
                 contour.y               = [self.lat[el[0]], self.lat[el[1]]]
                 contour.Geometry        = 'Line' 
-                contours[counter]       = contour
+                contours[count]       = contour
 
                 #second line:
@@ -234 +234 @@
                 contour.y               = [self.lat[el[1]], self.lat[el[2]]]
                 contour.Geometry        = 'Line'
-                contours[counter + 1]   = contour
+                contours[count + 1]   = contour
 
                 #second line:
@@ -241 +241 @@
                 contour.y               = [self.lat[el[2]], self.lat[el[0]]]
                 contour.Geometry        = 'Line'
-                contours[counter + 2]   = contour
-
-                #increase counter:
-                counter += 3
+                contours[count + 2]   = contour
+
+                #increase count:
+                count += 3
         elif geometry == 'polygon':
             # TODO: Refactor the following to reduce repeated code, or