Changeset 10969 for issm/trunk-jpl/src/m/classes/timestepping.m

Timestamp:

11/29/11 16:03:56 (13 years ago)

Author:

Mathieu Morlighem

Message:

Improvement: marshall is now a method of all model fields, removed unnecessary model fields (numcontrols... etc)

File:

• issm/trunk-jpl/src/m/classes/timestepping.m (modified) (3 diffs)

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

@@ -6 +6 @@
 classdef timestepping
         properties (SetAccess=public) 
-                time_step       = modelfield('default',0,'marshall',true,'format','Double');
-                final_time      = modelfield('default',0,'marshall',true,'format','Double');
-                time_adapt      = modelfield('default',0,'marshall',true,'format','Boolean');
-                cfl_coefficient = modelfield('default',0,'marshall',true,'format','Double');
+                time_step       = 0;
+                final_time      = 0;
+                time_adapt      = 0;
+                cfl_coefficient = 0;
         end
         methods
@@ -28 +28 @@
                 end % }}}
                 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
 
                         %time between 2 time steps
@@ -60 +53 @@
 
                 end % }}}
+                function marshall(obj,fid) % {{{
+                        WriteData(fid,'object',obj,'fieldname','time_step','format','Double');
+                        WriteData(fid,'object',obj,'fieldname','final_time','format','Double');
+                        WriteData(fid,'object',obj,'fieldname','time_adapt','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','cfl_coefficient','format','Double');
+                end % }}}
         end
 end