Changeset 20326

Timestamp:

03/21/16 15:24:41 (9 years ago)

Author:

Eric.Larour

Message:

CHG: changes to keep up with slr deltathickness new checksonsticy test.

File:

• issm/trunk-jpl/test/NightlyRun/test2002.m (modified) (3 diffs)

issm/trunk-jpl/test/NightlyRun/test2002.m

@@ -8 +8 @@
         %parameterize slr solution:
         %slr loading:  {{{
-        md.slr.deltathickness=zeros(md.mesh.numberofvertices,1);
+        md.slr.deltathickness=zeros(md.mesh.numberofelements,1);
         md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
         %antarctica
-        pos=find(md.mesh.lat <-80);
+        late=sum(md.mesh.lat(md.mesh.elements),2)/3;
+        longe=sum(md.mesh.long(md.mesh.elements),2)/3;
+        pos=find(late <-80);
         md.slr.deltathickness(pos)=-100;
         %greenlnd 
-        pos=find(md.mesh.lat > 70 &  md.mesh.lat < 80 & md.mesh.long>-60 & md.mesh.long<-30);
+        pos=find(late > 70 &  late < 80 & longe>-60 & longe<-30);
         md.slr.deltathickness(pos)=-100;
         
@@ -38 +40 @@
         md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,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;
+
         % }}}
         %geometry:  {{{
@@ -73 +79 @@
         md=solve(md,SealevelriseSolutionEnum);
         Selastic=md.results.SealevelriseSolution.Sealevel;
-
+        
+        %eustatic + rigid + elastic + rotation run: 
+        md.slr.eustatic=1; md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=1;
+        md=solve(md,SealevelriseSolutionEnum);
+        Srotation=md.results.SealevelriseSolution.Sealevel;
 
         %Fields and tolerances to track changes
-        field_names     ={'Eustatic','Rigid','Elastic'};
-        field_tolerances={1e-13,1e-13,1e-13};
-        field_values={Seustatic,Srigid,Selastic};
+        field_names     ={'Eustatic','Rigid','Elastic','Rotation'};
+        field_tolerances={1e-13,1e-13,1e-13,1e-13};
+        field_values={Seustatic,Srigid,Selastic,Srotation};