Index: ../trunk-jpl/test/NightlyRun/test2002.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test2002.m (revision 22978) +++ ../trunk-jpl/test/NightlyRun/test2002.m (revision 22979) @@ -40,8 +40,13 @@ md.mask.land_levelset=zeros(md.mesh.numberofvertices,1); md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); +%make sure that the elements that have loads are fully grounded: +pos=find(md.slr.deltathickness); +md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1; + %make sure wherever there is an ice load, that the mask is set to ice: -pos=find(md.slr.deltathickness); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1; +pos=find(md.slr.deltathickness); +md.mask.ice_levelset(md.mesh.elements(pos,:))=-1; % }}} md.slr.ocean_area_scaling=0; @@ -69,22 +74,23 @@ %Solution parameters md.slr.reltol=NaN; md.slr.abstol=1e-3; +md.slr.geodetic=1; % max number of iteration reverted back to 10 (i.e., the original default value) md.slr.maxiter=10; %eustatic run: -md.slr.rigid=0; md.slr.elastic=0; +md.slr.rigid=0; md.slr.elastic=0;md.slr.rotation=0; md=solve(md,'Sealevelrise'); Seustatic=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid run: -md.slr.rigid=1; md.slr.elastic=0; +md.slr.rigid=1; md.slr.elastic=0;md.slr.rotation=0; md=solve(md,'Sealevelrise'); Srigid=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid + elastic run: -md.slr.rigid=1; md.slr.elastic=1; +md.slr.rigid=1; md.slr.elastic=1;md.slr.rotation=0; md=solve(md,'Sealevelrise'); Selastic=md.results.SealevelriseSolution.Sealevel;