Changeset 14310 for issm/trunk/src/m/classes/settings.m

Timestamp:

02/04/13 08:01:04 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 14308

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/settings.m (modified) (2 diffs)

issm/trunk/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 % }}}
@@ -65 +65 @@
                         WriteData(fid,'object',obj,'fieldname','results_as_patches','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean');
+                        if obj.waitonlock>0,
+                                WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',true,'format','Boolean');
+                        else
+                                WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',false,'format','Boolean');
+                        end
                 end % }}}
         end