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

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

@@ -6 +6 @@
 classdef prognostic
         properties (SetAccess=public) 
-                 spcthickness           = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                 hydrostatic_adjustment = modelfield('default',0,'marshall',true,'preprocess','StringToEnum','format','Integer');
-                 stabilization          = modelfield('default',0,'marshall',true,'format','Integer');
-                 vertex_pairing         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-                 penalty_factor         = modelfield('default',0,'marshall',true,'format','Double');
+                 spcthickness           = NaN;
+                 hydrostatic_adjustment = 0;
+                 stabilization          = 0;
+                 vertex_pairing         = NaN;
+                 penalty_factor         = 0;
         end
         methods
@@ -29 +29 @@
                 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
 
                         %Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin
@@ -67 +60 @@
 
                 end % }}}
+                function marshall(obj,fid) % {{{
+                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
+                        WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum);
+                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
+                end % }}}
         end
 end