Changeset 17592

Timestamp:

03/28/14 09:59:01 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed GL tests

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test423.m (modified) (1 diff)
• test423.py (modified) (1 diff)
• test424.m (modified) (1 diff)
• test424.py (modified) (1 diff)
• test425.m (modified) (1 diff)
• test425.py (modified) (1 diff)
• test427.m (modified) (1 diff)
• test427.py (modified) (1 diff)
• test435.m (modified) (1 diff)

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

@@ -34 +34 @@
 vel_soft=(md.results.TransientSolution.Vel);
 
-md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.base;
+md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
 md.groundingline.migration='SubelementMigration';
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test423.py

@@ -45 +45 @@
 vel_soft=md.results.TransientSolution[0].Vel
 
-md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.base
+md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed
 md.groundingline.migration='SubelementMigration'
 md=solve(md,TransientSolutionEnum())

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

@@ -6 +6 @@
 md.initialization.vy(:)=0.;
 md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
-md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
+md.geometry.bed =-700.-abs(md.mesh.y-500000.)/1000.;
 md.geometry.thickness(:)=1000.;
 md.geometry.surface=md.geometry.base+md.geometry.thickness;

issm/trunk-jpl/test/NightlyRun/test424.py

@@ -16 +16 @@
 md.initialization.vy[:]=0.
 md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
-md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
+md.geometry.bed =-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
 md.geometry.thickness[:]=1000.
 md.geometry.surface=md.geometry.base+md.geometry.thickness

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

@@ -6 +6 @@
 md.initialization.vy(:)=0.;
 md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
-md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
+md.geometry.bed =-700.-abs(md.mesh.y-500000.)/1000.;
 md.geometry.thickness(:)=1300.;
 md.geometry.surface=md.geometry.base+md.geometry.thickness;

issm/trunk-jpl/test/NightlyRun/test425.py

@@ -16 +16 @@
 md.initialization.vy[:]=0.
 md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
-md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
+md.geometry.bed =-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
 md.geometry.thickness[:]=1300.
 md.geometry.surface=md.geometry.base+md.geometry.thickness

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

@@ -5 +5 @@
 md.initialization.vy(:)=0.;
 md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
-md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
+md.geometry.bed =-700.-abs(md.mesh.y-500000.)/1000.;
 md.geometry.thickness(:)=1300;
 md.geometry.surface=md.geometry.base+md.geometry.thickness;

issm/trunk-jpl/test/NightlyRun/test427.py

@@ -15 +15 @@
 md.initialization.vy[:]=0.
 md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
-md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
+md.geometry.bed =-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
 md.geometry.thickness[:]=1300
 md.geometry.surface=md.geometry.base+md.geometry.thickness

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

@@ -5 +5 @@
 md.initialization.vy(:)=1.;
 md.geometry.thickness(:)=500-md.mesh.x/10000;
-md.geometry.base=-100-md.mesh.x/1000;
+md.geometry.bed =-100-md.mesh.x/1000;
 md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
-md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.base;
+md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
 pos=find(md.mask.groundedice_levelset>=0);
-md.geometry.base(pos)=md.geometry.base(pos);
+md.geometry.base(pos)=md.geometry.bed(pos);
 md.geometry.surface=md.geometry.base+md.geometry.thickness;
 md=extrude(md,4,1.);