Changeset 20467

Timestamp:

04/07/16 15:57:18 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not use NaN for integers

Location:

issm/trunk-jpl/src/m/classes

Files:

• levelset.m (modified) (3 diffs)
• levelset.py (modified) (3 diffs)

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

@@ -8 +8 @@
                 stabilization           = 0;
                 spclevelset                     = NaN;
-                reinit_frequency        = NaN;
+                reinit_frequency        = 5;
         end
         methods
@@ -37 +37 @@
                         %stabilization = 2 by default
                         self.stabilization = 2;
-                        self.reinit_frequency = NaN;
+                        self.reinit_frequency = 5;
 
                 end % }}}
@@ -51 +51 @@
                         fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
-                        fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized (NaN: no re-initialization).');
+                        fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
                 end % }}}
                 function marshall(self,md,fid) % {{{

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

@@ -18 +18 @@
                 self.stabilization = 0
                 self.spclevelset   = float('NaN')
-                self.reinit_frequency = float('NaN')
+                self.reinit_frequency = 0
 
                 #set defaults
@@ -28 +28 @@
                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'))
                 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
-                string="%s\n%s"%(string,fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized (NaN: no re-initialization).'))
+                string="%s\n%s"%(string,fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized'))
 
                 return string
@@ -40 +40 @@
                 #stabilization = 2 by default
                 self.stabilization = 2
-                self.reinit_frequency = float('NaN')
+                self.reinit_frequency = 5
 
                 return self