[23186] | 1 | Index: ../trunk-jpl/test/NightlyRun/test2002.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/test/NightlyRun/test2002.m (revision 22978)
|
---|
| 4 | +++ ../trunk-jpl/test/NightlyRun/test2002.m (revision 22979)
|
---|
| 5 | @@ -40,8 +40,13 @@
|
---|
| 6 | md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
|
---|
| 7 | md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
|
---|
| 8 |
|
---|
| 9 | +%make sure that the elements that have loads are fully grounded:
|
---|
| 10 | +pos=find(md.slr.deltathickness);
|
---|
| 11 | +md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
|
---|
| 12 | +
|
---|
| 13 | %make sure wherever there is an ice load, that the mask is set to ice:
|
---|
| 14 | -pos=find(md.slr.deltathickness); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
|
---|
| 15 | +pos=find(md.slr.deltathickness);
|
---|
| 16 | +md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
|
---|
| 17 | % }}}
|
---|
| 18 |
|
---|
| 19 | md.slr.ocean_area_scaling=0;
|
---|
| 20 | @@ -69,22 +74,23 @@
|
---|
| 21 | %Solution parameters
|
---|
| 22 | md.slr.reltol=NaN;
|
---|
| 23 | md.slr.abstol=1e-3;
|
---|
| 24 | +md.slr.geodetic=1;
|
---|
| 25 |
|
---|
| 26 | % max number of iteration reverted back to 10 (i.e., the original default value)
|
---|
| 27 | md.slr.maxiter=10;
|
---|
| 28 |
|
---|
| 29 | %eustatic run:
|
---|
| 30 | -md.slr.rigid=0; md.slr.elastic=0;
|
---|
| 31 | +md.slr.rigid=0; md.slr.elastic=0;md.slr.rotation=0;
|
---|
| 32 | md=solve(md,'Sealevelrise');
|
---|
| 33 | Seustatic=md.results.SealevelriseSolution.Sealevel;
|
---|
| 34 |
|
---|
| 35 | %eustatic + rigid run:
|
---|
| 36 | -md.slr.rigid=1; md.slr.elastic=0;
|
---|
| 37 | +md.slr.rigid=1; md.slr.elastic=0;md.slr.rotation=0;
|
---|
| 38 | md=solve(md,'Sealevelrise');
|
---|
| 39 | Srigid=md.results.SealevelriseSolution.Sealevel;
|
---|
| 40 |
|
---|
| 41 | %eustatic + rigid + elastic run:
|
---|
| 42 | -md.slr.rigid=1; md.slr.elastic=1;
|
---|
| 43 | +md.slr.rigid=1; md.slr.elastic=1;md.slr.rotation=0;
|
---|
| 44 | md=solve(md,'Sealevelrise');
|
---|
| 45 | Selastic=md.results.SealevelriseSolution.Sealevel;
|
---|
| 46 |
|
---|