Changeset 19040 for issm/trunk-jpl/src/m/classes/seaice.m

Timestamp:

01/26/15 18:40:38 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renmaned obj -> self to look like python

File:

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

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

@@ -14 +14 @@
         end
         methods
-                function obj = seaice(varargin) % {{{
+                function self = seaice(varargin) % {{{
                         switch nargin
                                 case 0
-                                        obj=setdefaultparameters(obj);
+                                        self=setdefaultparameters(self);
                                         return;
                                 otherwise
@@ -23 +23 @@
                         end
                 end % }}}
-                function md = checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(self,md,solution,analyses) % {{{
                         if solution~=SeaiceSolutionEnum(), return; end
                         md = checkfield(md,'fieldname','seaice.min_concentration','NaN',1,'>=',0,'numel',1);
@@ -32 +32 @@
                         md = checkfield(md,'fieldname','seaice.coriolis_factor','size',[md.mesh.numberofelements 1],'NaN',1,'>=',0);
                 end % }}}
-                function obj = setdefaultparameters(obj) % {{{
+                function self = setdefaultparameters(self) % {{{
 
                         %Minimum ice concentration allowed in the simulation
-                        obj.min_concentration=0.;
+                        self.min_concentration=0.;
 
                         %Minimum ice thickness allowed in the simulation
-                        obj.min_thickness=0.;
+                        self.min_thickness=0.;
 
                         %Maxmimum ice thickness allowed in the simulation
-                        obj.max_thickness=25.;
+                        self.max_thickness=25.;
 
                 end % }}}
-                function disp(obj) % {{{
+                function disp(self) % {{{
                         disp(sprintf('   seaice parameters:'));
-                        fielddisplay(obj,'min_concentration','minimum ice concentration allowed in the simulation [no unit]');
-                        fielddisplay(obj,'min_thickness','minimum ice thickness allowed in the simulation [m]');
-                        fielddisplay(obj,'max_thickness','maximum ice thickness allowed in the simulation [m]');
-                        fielddisplay(obj,'spcvx','x-axis velocity constraint (NaN means no constraint) [m/s]');
-                        fielddisplay(obj,'spcvy','y-axis velocity constraint (NaN means no constraint) [m/s]');
-                        fielddisplay(obj,'coriolis_factor','factor applied to Coriolis forces (latitude dependent)');
+                        fielddisplay(self,'min_concentration','minimum ice concentration allowed in the simulation [no unit]');
+                        fielddisplay(self,'min_thickness','minimum ice thickness allowed in the simulation [m]');
+                        fielddisplay(self,'max_thickness','maximum ice thickness allowed in the simulation [m]');
+                        fielddisplay(self,'spcvx','x-axis velocity constraint (NaN means no constraint) [m/s]');
+                        fielddisplay(self,'spcvy','y-axis velocity constraint (NaN means no constraint) [m/s]');
+                        fielddisplay(self,'coriolis_factor','factor applied to Coriolis forces (latitude dependent)');
                 end % }}}
-                function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','min_concentration','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','max_thickness','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','coriolis_factor','format','DoubleMat','mattype',2);
+                function marshall(self,md,fid) % {{{
+                        WriteData(fid,'object',self,'fieldname','min_concentration','format','Double');
+                        WriteData(fid,'object',self,'fieldname','min_thickness','format','Double');
+                        WriteData(fid,'object',self,'fieldname','max_thickness','format','Double');
+                        WriteData(fid,'object',self,'fieldname','spcvx','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',self,'fieldname','spcvy','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',self,'fieldname','coriolis_factor','format','DoubleMat','mattype',2);
                 end % }}}
         end