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

Timestamp:

11/29/11 19:29:01 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 10980

Location:

issm/trunk

Files:

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

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

@@ -6 +6 @@
 classdef settings
         properties (SetAccess=public) 
-                io_gather           = modelfield('default',0,'marshall',true,'format','Boolean');
-                lowmem              = modelfield('default',0,'marshall',true,'format','Boolean');
-                results_on_vertices = modelfield('default',0,'marshall',true,'format','Boolean');
-                output_frequency    = modelfield('default',0,'marshall',true,'format','Integer');
-                waitonlock          = modelfield('default',0,'marshall',true,'format','Boolean');
+                io_gather           = 0;
+                lowmem              = 0;
+                results_as_patches  = 0;
+                output_frequency    = 0;
+                waitonlock          = 0;
         end
         methods
@@ -30 +30 @@
                 function obj = setdefaultparameters(obj) % {{{
 
-                        %first, use the defaults provided by the properties definition above. 
-                        fieldnames=fields(obj);
-                        for i=1:length(fieldnames),
-                                fieldname=fieldnames{i};
-                                obj.(fieldname)=obj.(fieldname).default;
-                        end
-
                         %are we short in memory ? (0 faster but requires more memory)
                         obj.lowmem=0;
@@ -45 +38 @@
                         %results frequency by default every step
                         obj.output_frequency=1;
+
+                        %do not use patches by default (difficult to plot)
+                        obj.results_as_patches=0;
 
                         %this option can be activated to load automatically the results
@@ -56 +52 @@
                         checkfield(md,'settings.io_gather','numel',1,'values',[0 1]);
                         checkfield(md,'settings.lowmem','numel',1,'values',[0 1]);
-                        checkfield(md,'settings.results_on_vertices','numel',1,'values',[0 1]);
+                        checkfield(md,'settings.results_as_patches','numel',1,'values',[0 1]);
                         checkfield(md,'settings.output_frequency','numel',1,'>=',1);
                         checkfield(md,'settings.waitonlock','numel',1);
@@ -66 +62 @@
                         fielddisplay(obj,'io_gather','I/O gathering strategy for result outputs (default 1)');
                         fielddisplay(obj,'lowmem','is the memory limited ? (0 or 1)');
-                        fielddisplay(obj,'results_on_vertices','provide results on vertices instead of patch (0 or 1)');
+                        fielddisplay(obj,'results_as_patches','provide results as patches for each element (0 or 1)');
                         fielddisplay(obj,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps');
                         fielddisplay(obj,'waitonlock','maximum number of minutes to wait for batch results, or return 0');
 
                 end % }}}
+                function marshall(obj,fid) % {{{
+                        WriteData(fid,'object',obj,'fieldname','io_gather','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','lowmem','format','Boolean');
+                        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');
+                end % }}}
         end
 end