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

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

@@ -10 +10 @@
         end
         methods
-        function createxml(obj,fid) % {{{
+        function createxml(self,fid) % {{{
             fprintf(fid, '\n\n');
             fprintf(fid, '%s\n', '<!-- Hydrology -->');
@@ -17 +17 @@
             fprintf(fid,'%s\n%s\n%s\n','<frame key="1" label="Hydrologyshreve solution parameters">','<section name="hydrologyshreve" />');                    
             
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="spcwatercolumn" type="',      class(obj.spcwatercolumn),'" default="',        convert2str(obj.spcwatercolumn),'">',        '     <section name="hydrologyshreve" />','     <help> water thickness constraints (NaN means no constraint) [m] </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="stabilization" type="',         class(obj.stabilization),'" default="',           convert2str(obj.stabilization),'">', '     <section name="hydrologyshreve" />','     <help> artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. </help>','</parameter>');
+                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="spcwatercolumn" type="',      class(self.spcwatercolumn),'" default="',        convert2str(self.spcwatercolumn),'">',      '     <section name="hydrologyshreve" />','     <help> water thickness constraints (NaN means no constraint) [m] </help>','</parameter>');
+            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="stabilization" type="',         class(self.stabilization),'" default="',           convert2str(self.stabilization),'">',       '     <section name="hydrologyshreve" />','     <help> artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. </help>','</parameter>');
             fprintf(fid,'%s\n%s\n','</frame>');
         end % }}}
-                function obj = hydrologyshreve(varargin) % {{{
+                function self = hydrologyshreve(varargin) % {{{
                         switch nargin
                                 case 0
-                                        obj=setdefaultparameters(obj);
+                                        self=setdefaultparameters(self);
                                 case 1
-                                        obj=structtoobj(obj,varargin{1});
+                                        obj=structtoobj(self,varargin{1});
                                 otherwise
                                         error('constructor not supported');
                         end
                 end % }}}
-                function obj = setdefaultparameters(obj) % {{{
+                function self = setdefaultparameters(self) % {{{
 
                         %Type of stabilization to use 0:nothing 1:artificial_diffusivity
-                        obj.stabilization=1;
+                        self.stabilization=1;
                 end % }}}
-                function md = checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(self,md,solution,analyses) % {{{
 
                         %Early return
@@ -46 +46 @@
                         md = checkfield(md,'fieldname','hydrology.stabilization','>=',0);
                 end % }}}
-                function disp(obj) % {{{
+                function disp(self) % {{{
                         disp(sprintf('   hydrologyshreve solution parameters:'));
-                        fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]');
-                        fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.');
+                        fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]');
+                        fielddisplay(self,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.');
 
                 end % }}}
-                function marshall(obj,md,fid) % {{{
+                function marshall(self,md,fid) % {{{
                         WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
-                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Double');
+                        WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
+                        WriteData(fid,'object',self,'fieldname','stabilization','format','Double');
                 end % }}}
         end