Changeset 22758 for issm/trunk/src/m/classes/massconaxpby.m

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/massconaxpby.m (modified) (4 diffs)

issm/trunk/src/m/classes/massconaxpby.m

@@ -3 +3 @@
 %   Usage:
 %      massconaxpby=massconaxpby();
-%      massconsumaxpby=massconaxpby('name','MassCon58+35','namex','MassCon58','alpha',.5,'namey','MassCon35','beta',.5); 
+%      massconaxpby=massconaxpby('name','MassCon58+35','namex','MassCon58','alpha',.5,'namey','MassCon35','beta',.5,'definitionstring','Outputdefinition1'); 
 % 
 %   where name is the name of the massconaxpby object, namex is the name of the first masscon, namey the name of the second masscon and alpha,beta the 
@@ -9 +9 @@
 %         of two masscons.
 %
-%   See also: MASSCON
+%   See also: MASSCON, REGIONALOUTPUT
 
 classdef massconaxpby
         properties (SetAccess=public)
                 %masscon axpby
-                name              = '';
+                name               = '';
                 definitionstring   = ''; %String that identifies this output definition uniquely, from 'Outputdefinition[1-10]'
                 namex              = '';
                 namey              = '';
                 alpha              = NaN;
-                beta              = NaN;
+                beta               = NaN;
         end
         
         methods
+                function self = extrude(self,md) % {{{
+                end % }}}
                 function self = massconaxpby(varargin) % {{{
                         if nargin==0,
@@ -65 +67 @@
                 function md = disp(self) % {{{
                 
-                        disp(sprintf('   Misfit:\n'));
+                        disp(sprintf('   Massconaxpby:\n'));
 
                         fielddisplay(self,'name','name');
@@ -77 +79 @@
                 function md = marshall(self,prefix,md,fid) % {{{
 
-                WriteData(fid,prefix,'object',self,'fieldname','name','format','String');
-                WriteData(fid,prefix,'object',self,'fieldname','definitionstring','format','Integer');
-                WriteData(fid,prefix,'object',self,'fieldname','namex','format','String');
-                WriteData(fid,prefix,'object',self,'fieldname','namey','format','String');
-                WriteData(fid,prefix,'object',self,'fieldname','alpha','format','Double');
-                WriteData(fid,prefix,'object',self,'fieldname','beta','format','Double');
+                        WriteData(fid,prefix,'data',self.name,'name','md.massconaxpby.name','format','String');
+                        WriteData(fid,prefix,'data',self.definitionstring,'name','md.massconaxpby.definitionstring','format','String');
+                        WriteData(fid,prefix,'data',self.namex,'name','md.massconaxpby.namex','format','String');
+                        WriteData(fid,prefix,'data',self.namey,'name','md.massconaxpby.namey','format','String');
+                        WriteData(fid,prefix,'data',self.alpha,'name','md.massconaxpby.alpha','format','Double');
+                        WriteData(fid,prefix,'data',self.beta,'name','md.massconaxpby.beta','format','Double');
 
                 end % }}}