Changeset 25836 for issm/trunk/test/NightlyRun/test4001.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun (modified) (1 prop)
• test/NightlyRun/test4001.m (modified) (8 diffs)

issm/trunk/test/NightlyRun

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

issm/trunk/test/NightlyRun/test4001.m

@@ -439 +439 @@
 
     %level sets:
-    md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
+    md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
 
     pos=find(ice_mask); md.mask.ice_levelset(pos)=-1;
-    pos=find(~iceshelf_mask & ice_mask); md.mask.groundedice_levelset(pos)=1;
+    pos=find(~iceshelf_mask & ice_mask); md.mask.ocean_levelset(pos)=1;
 
     %identify edges of grounded ice:
-    groundedice_levelset=md.mask.groundedice_levelset;
+    ocean_levelset=md.mask.ocean_levelset;
     for i=1:md.mesh.numberofelements,
-        m=groundedice_levelset(md.mesh.elements(i,:));
+        m=ocean_levelset(md.mesh.elements(i,:));
         if abs(sum(m))~=3,
-            pos=find(m==1); md.mask.groundedice_levelset(md.mesh.elements(i,pos))=0;
+            pos=find(m==1); md.mask.ocean_levelset(md.mesh.elements(i,pos))=0;
         end
     end
@@ -483 +483 @@
     %friction:
     md.friction.coefficient=30*ones(md.mesh.numberofvertices,1);
-    pos=find(md.mask.groundedice_levelset<=0);
+    pos=find(md.mask.ocean_levelset<=0);
     md.friction.coefficient(pos)=0;
     md.friction.p=ones(md.mesh.numberofelements,1);
@@ -521 +521 @@
     vertex_on_boundary=zeros(md.mesh.numberofvertices,1);
     vertex_on_boundary(md.mesh.segments(:,1:2))=1;
-    pos=find(vertex_on_boundary & md.mask.groundedice_levelset<=0);
+    pos=find(vertex_on_boundary & md.mask.ocean_levelset<=0);
     md.stressbalance.spcvx(pos)=md.initialization.vx(pos);
     md.stressbalance.spcvy(pos)=md.initialization.vy(pos);
@@ -838 +838 @@
         md.initialization.vel=md.results.TransientSolution(end).Vel;
         md.initialization.pressure=md.results.TransientSolution(end).Pressure;
-        md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset;
+        md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset;
         md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate;
 
@@ -862 +862 @@
 fnm=['run/SHICE_fwFluxtave_0000017520.data'];
 melting_rate_4=readbin(fnm,[Nx Ny]);
-field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',...
-    'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',...
-    'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'};
+field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
+    'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
+    'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
 field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
@@ -875 +875 @@
     (md.results(2).TransientSolution(end).Thickness),...
     (md.results(2).TransientSolution(end).Base),...
-    (md.results(2).TransientSolution(end).MaskGroundediceLevelset),...
+    (md.results(2).TransientSolution(end).MaskOceanLevelset),...
     (md.results(2).TransientSolution(end).FloatingiceMeltingRate),...
     (melting_rate_2(:)),...
@@ -882 +882 @@
     (md.results(3).TransientSolution(end).Thickness),...
     (md.results(3).TransientSolution(end).Base),...
-    (md.results(3).TransientSolution(end).MaskGroundediceLevelset),...
+    (md.results(3).TransientSolution(end).MaskOceanLevelset),...
     (md.results(3).TransientSolution(end).FloatingiceMeltingRate),...
     (melting_rate_3(:)),...
@@ -889 +889 @@
     (md.results(4).TransientSolution(end).Thickness),...
     (md.results(4).TransientSolution(end).Base),...
-    (md.results(4).TransientSolution(end).MaskGroundediceLevelset),...
+    (md.results(4).TransientSolution(end).MaskOceanLevelset),...
     (md.results(4).TransientSolution(end).FloatingiceMeltingRate),...
     (melting_rate_4(:)),...

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err