Changeset 25221

Timestamp:

07/06/20 20:08:53 (5 years ago)

Author:

Eric.Larour

Message:

CHG: handle mat arrays for surface loads.

File:

• issm/trunk-jpl/src/m/classes/surfaceload.m (modified) (4 diffs)

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

@@ -26 +26 @@
                 
                 end % }}}
-                function md = checkconsistency(self,md,solution,analyses) % {{{
+                        function md = checkconsistency(self,md,solution,analyses) % {{{
 
                         if ~ismember('SealevelriseAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.transient.isslr==0), 
@@ -32 +32 @@
                         end
                         if ~isempty(self.icethicknesschange),
-                                md = checkfield(md,'fieldname','solidearth.surfaceload.icethicknesschange','timeseries',1,'NaN',1,'Inf',1);
+                                if isa(self.icethicknesschange,'cell'),
+                                        for i=1:length(self.icethicknesschange),
+                                                md = checkfield(md,'field',self.icethicknesschange{i},'NaN',0,'Inf',1,'timeserieslength',1,'Inf',1);
+                                        end
+                                else
+                                        md = checkfield(md,'field',self.icethicknesschange,'NaN',1,'Inf',1,'timeserieslength',1,'Inf',1);
+                                end
                         end
                         if ~isempty(self.waterheightchange),
@@ -69 +75 @@
                                 self.other=zeros(md.mesh.numberofelements+1,1);
                         end
-                        WriteData(fid,prefix,'object',self,'fieldname','icethicknesschange','name','md.solidearth.surfaceload.icethicknesschange',...
+                        if isa(self.icethicknesschange,'cell'),
+                                WriteData(fid,prefix,'object',self,'fieldname','icethicknesschange','name','md.solidearth.surfaceload.icethicknesschange',...
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
+                        else
+                                WriteData(fid,prefix,'object',self,'fieldname','icethicknesschange','name','md.solidearth.surfaceload.icethicknesschange',...
                                 'format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
+                        end
+
                         WriteData(fid,prefix,'object',self,'fieldname','waterheightchange','name','md.solidearth.surfaceload.waterheightchange',...
                                 'format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
@@ -78 +90 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
                         writejs1Darray(fid,[modelname '.surfaceload.icethicknesschange'],self.icethicknesschange);
                         writejs1Darray(fid,[modelname '.surfaceload.waterheightchange'],self.waterheightchange);