[21726] | 1 | Index: ../trunk-jpl/src/m/classes/calvingdev.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/calvingdev.m (revision 21630)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/calvingdev.m (revision 21631)
|
---|
| 5 | @@ -33,9 +33,6 @@
|
---|
| 6 | end % }}}
|
---|
| 7 | function self = setdefaultparameters(self) % {{{
|
---|
| 8 |
|
---|
| 9 | - %Proportionality coefficient in Pi model
|
---|
| 10 | - %self.coeff=2e13;
|
---|
| 11 | -
|
---|
| 12 | %Default sigma max
|
---|
| 13 | self.stress_threshold_groundedice = 1e6;
|
---|
| 14 | self.stress_threshold_floatingice = 150e3;
|
---|
| 15 | @@ -58,9 +55,9 @@
|
---|
| 16 | function marshall(self,prefix,md,fid) % {{{
|
---|
| 17 | yts=md.constants.yts;
|
---|
| 18 | WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer');
|
---|
| 19 | - WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1);
|
---|
| 20 | - WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1);
|
---|
| 21 | - WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);
|
---|
| 22 | + WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','Double');
|
---|
| 23 | + WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','Double');
|
---|
| 24 | + WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
|
---|
| 25 | end % }}}
|
---|
| 26 | end
|
---|
| 27 | end
|
---|