Changeset 14101

Timestamp:

12/05/12 14:32:40 (12 years ago)

Author:

jschierm

Message:

CHG: Change default waitonlock to integer inf for python (plus other cosmetic changes).

Location:

issm/trunk-jpl/src/m/classes

Files:

• pairoptions.m (modified) (6 diffs)
• pairoptions.py (modified) (3 diffs)
• plotoptions.m (modified) (1 diff)
• settings.m (modified) (1 diff)
• settings.py (modified) (1 diff)

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

@@ -84 +84 @@
                 %CHANGEOPTIONVALUE - change the value of an option in an option list
 
-                        %track occurance of field
+                        %track occurrence of field
                         lines=find(strcmpi(obj.list(:,1),field));
 
@@ -100 +100 @@
                 %DELETEDUPLICATES - delete duplicates in an option list
 
-                        %track the first occurance of each option
+                        %track the first occurrence of each option
                         [dummy lines]=unique(obj.list(:,1),'first');
                         clear dummy
@@ -109 +109 @@
                                 for i=1:numoptions,
                                         if ~ismember(i,lines),
-                                                disp(['WARNING: option ' obj.list{i,1} ' appeared more than once. Only its first occurence will be kept'])
+                                                disp(['WARNING: option ' obj.list{i,1} ' appeared more than once. Only its first occurrence will be kept'])
                                         end
                                 end
@@ -137 +137 @@
                 end % }}}
                 function bool = exist(obj,field) % {{{
-                %EXIST - check if the option exist
+                %EXIST - check if the option exists
 
                         %some argument checking: 
@@ -150 +150 @@
                         bool=any(strcmpi(field,obj.list(:,1)));
                 end % }}}
-                function num = fieldoccurences(obj,field), % {{{
-                %FIELDOCCURENCES - get number of occurence of a field
+                function num = fieldoccurrences(obj,field), % {{{
+                %FIELDOCCURRENCES - get number of occurrence of a field
 
                         %check input 
                         if ~ischar(field),
-                                error('fieldoccurences error message: field should be a string');
-                        end
-
-                        %get number of occurence
+                                error('fieldoccurrences error message: field should be a string');
+                        end
+
+                        %get number of occurrence
                         num=sum(strcmpi(field,obj.list(:,1)));
                 end % }}}
@@ -204 +204 @@
                 %      obj=removefield(obj,field,warn)
                 %
-                %   if warn==1 display an info message to wan user that
+                %   if warn==1 display an info message to warn user that
                 %   some of his options have been removed.
 

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

@@ -78 +78 @@
 #       %DELETEDUPLICATES - delete duplicates in an option list
 #
-#               %track the first occurance of each option
+#               %track the first occurrence of each option
 #               [dummy lines]=unique(obj.list(:,1),'first');
 #               clear dummy
@@ -87 +87 @@
 #                       for i=1:numoptions,
 #                               if ~ismember(i,lines),
-#                                       disp(['WARNING: option ' obj.list{i,1} ' appeared more than once. Only its first occurence will be kept'])
+#                                       disp(['WARNING: option ' obj.list{i,1} ' appeared more than once. Only its first occurrence will be kept'])
 #                               end
 #                       end
@@ -128 +128 @@
         # }}}
 
-        #def fieldoccurences(self,field): #{{{
+        #def fieldoccurrences(self,field): #{{{
         #       '''
-        #       FIELDOCCURENCES - get number of occurence of a field
+        #       FIELDOCCURRENCES - get number of occurrence of a field
         #       '''
         #
         #       #check input 
         #       if not isinstance(field,(str,unicode)):
-        #               raise TypeError("fieldoccurences error message: field should be a string")
-
-        #       #get number of occurence
+        #               raise TypeError("fieldoccurrences error message: field should be a string")
+
+        #       #get number of occurrence
         #       # ??
         #       #return num

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

@@ -68 +68 @@
 
                          %get number of data to be plotted
-                         numberofplots=fieldoccurences(rawoptions,'data');
+                         numberofplots=fieldoccurrences(rawoptions,'data');
                          opt.numberofplots=numberofplots;
 

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

@@ -38 +38 @@
                         %onto the model after a parallel run by waiting for the lock file
                         %N minutes that is generated once the solution has converged
-                        %0 to desactivate
+                        %0 to deactivate
                         obj.waitonlock=Inf;
                 end % }}}

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

@@ -56 +56 @@
                 #onto the model after a parallel run by waiting for the lock file
                 #N minutes that is generated once the solution has converged
-                #0 to desactivate
-                self.waitonlock=float('Inf')
+                #0 to deactivate
+                self.waitonlock=2**31-1
 
                 return self