Changeset 25836 for issm/trunk/test/NightlyRun/test423.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/test423.m (modified) (2 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/test423.m

@@ -8 +8 @@
 pos=find(rad==min(rad));
 md.mesh.x(pos)=0.; md.mesh.y(pos)=0.; %the closest node to the center is changed to be exactly at the center
-xelem=md.mesh.x(md.mesh.elements)*[1;1;1]/3.;
-yelem=md.mesh.y(md.mesh.elements)*[1;1;1]/3.;
+xelem=mean(md.mesh.x(md.mesh.elements),2);
+yelem=mean(md.mesh.y(md.mesh.elements),2);
 rad=sqrt(xelem.^2+yelem.^2);
 flags=zeros(md.mesh.numberofelements,1);
@@ -28 +28 @@
 md.groundingline.migration='AggressiveMigration';
 md=solve(md,'Transient');
-element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset);
+element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset);
 vel_agressive=(md.results.TransientSolution.Vel);
 
 md.groundingline.migration='SoftMigration';
 md=solve(md,'Transient');
-element_on_iceshelf_soft=(md.results.TransientSolution.MaskGroundediceLevelset);
+element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset);
 vel_soft=(md.results.TransientSolution.Vel);
 
-md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
+md.mask.ocean_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
 md.groundingline.migration='SubelementMigration';
 md.groundingline.friction_interpolation='SubelementFriction1';
 md=solve(md,'Transient');
-element_on_iceshelf_subelement=(md.results.TransientSolution.MaskGroundediceLevelset);
+element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset);
 vel_subelement=(md.results.TransientSolution.Vel);
 
 md.groundingline.friction_interpolation='SubelementFriction2';
 md=solve(md,'Transient');
-element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskGroundediceLevelset);
+element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset);
 vel_subelement2=(md.results.TransientSolution.Vel);
 

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