Changeset 22986

Timestamp:

07/19/18 17:02:14 (7 years ago)

Author:

Eric.Larour

Message:

CHG: updating 2003 and 2010 tests. Small changes in the .m files.

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive2003.arch (modified) ( previous)
• Archives/Archive2010.arch (modified) ( previous)
• NightlyRun/test2003.m (modified) (2 diffs)
• NightlyRun/test2003.py (modified) (1 diff)
• NightlyRun/test2010.m (modified) (3 diffs)
• NightlyRun/test2010.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test2003.m ¶

@@ -38 +38 @@
 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;
@@ -68 +72 @@
 md.slr.reltol=NaN;
 md.slr.abstol=1e-3;
+md.slr.geodetic=1;
 
 %eustatic + rigid + elastic run: 

issm/trunk-jpl/test/NightlyRun/test2003.py ¶

@@ -83 +83 @@
 md.slr.reltol = float('NaN')
 md.slr.abstol = 1e-3
+md.slr.geodetic=1
 
 #eustatic + rigid + elastic run: 

issm/trunk-jpl/test/NightlyRun/test2010.m ¶

@@ -41 +41 @@
 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: 
 md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
@@ -64 +68 @@
 md.slr.reltol=NaN;
 md.slr.abstol=1e-3;
+md.slr.geodetic=1;
 % }}}
 
@@ -77 +82 @@
 % uncomment following 2 lines for 
 md=solve(md,'Sealevelrise');
-eus=md.results.SealevelriseSolution.SealevelEustatic;
+eus=md.results.SealevelriseSolution.SealevelRSLEustatic;
 slr=md.results.SealevelriseSolution.Sealevel;
 moixz=md.results.SealevelriseSolution.SealevelInertiaTensorXZ; 

issm/trunk-jpl/test/NightlyRun/test2010.py ¶

@@ -80 +80 @@
 md.slr.reltol = float('NaN')
 md.slr.abstol = 1e-3
+md.slr.geodetic = 1
 # }}}