Changeset 21605

Timestamp:

03/11/17 16:06:46 (8 years ago)

Author:

Eric.Larour

Message:

CHG: some matlab classes

Location:

issm/branches/trunk-larour-GRL2017/src/m

Files:

• classes/massconaxpby.m (modified) (2 diffs)
• classes/misfit.m (modified) (1 diff)
• coordsystems/gdalinfo.m (added)

issm/branches/trunk-larour-GRL2017/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); 
 % 
 %   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 
@@ -77 +77 @@
                 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 % }}}
         end

issm/branches/trunk-larour-GRL2017/src/m/classes/misfit.m

@@ -71 +71 @@
                         md = checkfield(md,'fieldname','self.observation','field',self.observation,'timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','self.timeinterpolation','field',self.timeinterpolation,'values',{'nearestneighbor'});
-                        md = checkfield(md,'fieldname','self.weights','field',self.weights,'timeseries',1,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','self.weights','field',self.weights,'timeseries',1,'NaN',1,'Inf',1); 
+
+                        if ~ischar(self.definitionstring) | ~ischar(self.model_string) | ~ischar(self.observation_string) | ~ischar(self.weights_string),
+                                error('one of definitionstring, model_string, observation_string or weights_string is empty!');
+                        end
 
                 end % }}}