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

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

@@ -6 +6 @@
 classdef initialization
         properties (SetAccess=public) 
-                vx            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VxEnum);
-                vy            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VyEnum);
-                vz            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VzEnum);
-                vel           = modelfield('default',NaN,'marshall',false);
-                pressure      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',PressureEnum);
-                temperature   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',TemperatureEnum);
-                watercolumn   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum);
-                waterfraction = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum);
+                vx            = NaN;
+                vy            = NaN;
+                vz            = NaN;
+                vel           = NaN;
+                pressure      = NaN;
+                temperature   = NaN;
+                watercolumn   = NaN;
+                waterfraction = NaN;
         end
         methods
@@ -32 +32 @@
                 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
 
                 end % }}}
@@ -83 +76 @@
 
                 end % }}}
+                function marshall(obj,fid) % {{{
+                        WriteData(fid,'data',obj.vx,'format','DoubleMat','mattype',1,'enum',VxEnum);
+                        WriteData(fid,'data',obj.vy,'format','DoubleMat','mattype',1,'enum',VyEnum);
+                        WriteData(fid,'data',obj.vz,'format','DoubleMat','mattype',1,'enum',VzEnum);
+                        WriteData(fid,'data',obj.pressure,'format','DoubleMat','mattype',1,'enum',PressureEnum);
+                        WriteData(fid,'data',obj.temperature,'format','DoubleMat','mattype',1,'enum',TemperatureEnum);
+                        WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum);
+                        WriteData(fid,'data',obj.waterfraction,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum);
+                end % }}}
         end
 end