Changeset 10304

Timestamp:

10/25/11 16:28:27 (13 years ago)

Author:

seroussi

Message:

NR grounding line: put geometry description into .par file

Location:

issm/trunk/test

Files:

• NightlyRun/test445.m (modified) (1 diff)
• NightlyRun/test446.m (modified) (1 diff)
• Par/RoundSheetShelf.par (modified) (1 diff)

issm/trunk/test/NightlyRun/test445.m

@@ -17 +17 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=none;
-%plug holes into the ice sheet, to test for grounding line migration. 
-di=md.materials.rho_ice/md.materials.rho_water;
-rad=sqrt(md.mesh.x.^2+md.mesh.y.^2);
-pos=find(rad<200000);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
 
-pos=find(md.mesh.x<.2*1e6 & md.mesh.x>-.2*1e6 & md.mesh.y>0);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
-
-pos=find(md.mesh.x<.1*1e6 & md.mesh.x>-.1*1e6 & md.mesh.y<-.5*1e6 & md.mesh.y>-.6*1e6);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
-
-%test different grounding line dynamics.
 md.transient.isthermal=0;
 md.transient.isprognostic=0;
 md.transient.isdiagnostic=0;
 md.transient.isgroundingline=1;
+
+%test different grounding line dynamics
 md.groundingline.migration='AgressiveMigration';
 md=solve(md,TransientSolutionEnum);

issm/trunk/test/NightlyRun/test446.m

@@ -17 +17 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-%plug holes into the ice sheet, to test for grounding line migration. 
-di=md.materials.rho_ice/md.materials.rho_water;
-rad=sqrt(md.mesh.x.^2+md.mesh.y.^2);
-pos=find(rad<200000);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
 
-pos=find(md.mesh.x<.2*1e6 & md.mesh.x>-.2*1e6 & md.mesh.y>0);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
-
-pos=find(md.mesh.x<.1*1e6 & md.mesh.x>-.1*1e6 & md.mesh.y<-.5*1e6 & md.mesh.y>-.6*1e6);
-md.geometry.thickness(pos)=100;
-md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
-md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
-
-%test different grounding line dynamics.
 md.transient.isthermal=0;
 md.transient.isprognostic=0;
 md.transient.isdiagnostic=0;
 md.transient.isgroundingline=1;
+
+%test different grounding line dynamics.
 md.groundingline.migration='AgressiveMigration';
 md=solve(md,TransientSolutionEnum);

issm/trunk/test/Par/RoundSheetShelf.par

@@ -33 +33 @@
 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
 
+%plug holes into the ice sheet, to test for grounding line migration. 
+di=md.materials.rho_ice/md.materials.rho_water;
+rad=sqrt(md.mesh.x.^2+md.mesh.y.^2);
+pos=find(rad<200000);
+md.geometry.thickness(pos)=100;
+md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
+md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
+
+pos=find(md.mesh.x<.2*1e6 & md.mesh.x>-.2*1e6 & md.mesh.y>0);
+md.geometry.thickness(pos)=100;
+md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
+md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
+
+pos=find(md.mesh.x<.1*1e6 & md.mesh.x>-.1*1e6 & md.mesh.y<-.5*1e6 & md.mesh.y>-.6*1e6);
+md.geometry.thickness(pos)=100;
+md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20;
+md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
 %Initial velocity 
 md.initialization.vx=zeros(md.mesh.numberofvertices,1);