Last change
on this file since 23390 was 23390, checked in by Mathieu Morlighem, 6 years ago |
CHG: added Archive/23185-23389
|
File size:
894 bytes
|
Rev | Line | |
---|
[23390] | 1 | Index: ../trunk-jpl/src/m/classes/groundingline.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/groundingline.m (revision 23353)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/groundingline.m (revision 23354)
|
---|
| 5 | @@ -32,7 +32,7 @@
|
---|
| 6 | md = checkfield(md,'fieldname','groundingline.friction_interpolation','values',{'NoFrictionOnPartiallyFloating' 'SubelementFriction1' 'SubelementFriction2'});
|
---|
| 7 | md = checkfield(md,'fieldname','groundingline.melt_interpolation','values',{'NoMeltOnPartiallyFloating' 'SubelementMelt1' 'SubelementMelt2' 'FullMeltOnPartiallyFloating'});
|
---|
| 8 |
|
---|
| 9 | - if ~strcmp(self.migration,'None'),
|
---|
| 10 | + if ~strcmp(self.migration,'None') & strcmp(solution,'TransientSolution') & md.transient.isgroundingline==1,
|
---|
| 11 | if isnan(md.geometry.bed),
|
---|
| 12 | md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']);
|
---|
| 13 | end
|
---|
Note:
See
TracBrowser
for help on using the repository browser.