Changeset 10969 for issm/trunk-jpl/src/m/classes/thermal.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/thermal.m (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/thermal.m ¶

@@ -6 +6 @@
 classdef thermal
         properties (SetAccess=public) 
-                spctemperature    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                penalty_threshold = modelfield('default',0,'marshall',true,'format','Integer');
-                stabilization     = modelfield('default',0,'marshall',true,'format','Integer');
-                maxiter           = modelfield('default',0,'marshall',true,'format','Integer');
-                penalty_lock      = modelfield('default',0,'marshall',true,'format','Integer');
-                penalty_factor    = modelfield('default',0,'marshall',true,'format','Double');
+                spctemperature    = NaN;
+                penalty_threshold = 0;
+                stabilization     = 0;
+                maxiter           = 0;
+                penalty_lock      = 0;
+                penalty_factor    = 0;
         end
         methods
@@ -30 +30 @@
                 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
 
                         %Number of unstable constraints acceptable
@@ -68 +61 @@
 
                 end % }}}
+                function marshall(obj,fid) % {{{
+                        WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
+                end % }}}
         end
 end