Changeset 22045

Timestamp:

09/05/17 14:52:06 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allowing 2d fields for calvingdev

File:

• issm/trunk-jpl/src/m/classes/calvingdev.m (modified) (2 diffs)

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

@@ -42 +42 @@
                         if (~strcmp(solution,'TransientSolution') | md.transient.ismovingfront==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'numel',1,'nan',1,'Inf',1);
-                        md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'numel',1,'nan',1,'Inf',1);
+                        md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1);
+                        md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1);
                         md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                 end % }}}
@@ -56 +56 @@
                         yts=md.constants.yts;
                         WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','Double');
-                        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
                 end % }}}