Changeset 21167

Timestamp:

08/25/16 17:42:44 (9 years ago)

Author:

agscott1

Message:

BUG: Fixed paths for par files under test

Location:

issm/trunk-jpl/test/Par

Files:

• 79North.par (modified) (1 diff)
• GiaBenchmarksAB.par (modified) (1 diff)
• GiaBenchmarksCD.par (modified) (1 diff)
• ISMIPE.par (modified) (1 diff)
• Pig.par (modified) (1 diff)
• SquareSheetConstrained.par (modified) (2 diffs)
• SquareSheetShelf.par (modified) (1 diff)
• SquareShelf.par (modified) (1 diff)
• SquareShelf2.par (modified) (1 diff)
• SquareShelfConstrained.par (modified) (1 diff)

issm/trunk-jpl/test/Par/79North.par

@@ -2 +2 @@
 
 %Geometry and observation
-x=archread('../Data/79North.nc','x');
-y=archread('../Data/79North.nc','y');
-vx=archread('../Data/79North.nc','vx');
-vy=archread('../Data/79North.nc','vy');
-index=archread('../Data/79North.nc','index');
-surface=archread('../Data/79North.nc','surface');
-thickness=archread('../Data/79North.nc','thickness');
+x = archread('../Data/79North.arch','x');
+y = archread('../Data/79North.arch','y');
+vx = archread('../Data/79North.arch','vx');
+vy = archread('../Data/79North.arch','vy');
+index = archread('../Data/79North.arch','index');
+surface = archread('../Data/79North.arch','surface');
+thickness = archread('../Data/79North.arch','thickness');
 md.initialization.vx =InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
 md.initialization.vy =InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/GiaBenchmarksAB.par

@@ -27 +27 @@
 
 %Initial velocity 
-x     = archread('../Data/SquareSheetConstrained.nc','x');
-y     = archread('../Data/SquareSheetConstrained.nc','y');
-vx    = archread('../Data/SquareSheetConstrained.nc','vx');
-vy    = archread('../Data/SquareSheetConstrained.nc','vy');
-index = archread('../Data/SquareSheetConstrained.nc','index');
+x     = archread('../Data/SquareSheetConstrained.arch','x');
+y     = archread('../Data/SquareSheetConstrained.arch','y');
+vx    = archread('../Data/SquareSheetConstrained.arch','vx');
+vy    = archread('../Data/SquareSheetConstrained.arch','vy');
+index = archread('../Data/SquareSheetConstrained.arch','index');
 
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/GiaBenchmarksCD.par

@@ -26 +26 @@
 
 %Initial velocity 
-x     = archread('../Data/SquareSheetConstrained.nc','x');
-y     = archread('../Data/SquareSheetConstrained.nc','y');
-vx    = archread('../Data/SquareSheetConstrained.nc','vx');
-vy    = archread('../Data/SquareSheetConstrained.nc','vy');
-index = archread('../Data/SquareSheetConstrained.nc','index');
+x     = archread('../Data/SquareSheetConstrained.arch','x');
+y     = archread('../Data/SquareSheetConstrained.arch','y');
+vx    = archread('../Data/SquareSheetConstrained.arch','vx');
+vy    = archread('../Data/SquareSheetConstrained.arch','vy');
+index = archread('../Data/SquareSheetConstrained.arch','index');
 
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/ISMIPE.par

@@ -2 +2 @@
 
 disp('      creating thickness');
-data=archread('../Data/ISMIPE.nc','data');
+data=archread('../Data/ISMIPE.arch','data');
 md.geometry.surface=zeros(md.mesh.numberofvertices,1);
 md.geometry.base=zeros(md.mesh.numberofvertices,1);

issm/trunk-jpl/test/Par/Pig.par

@@ -2 +2 @@
 
 %Geometry and observation
-x         = archread('../Data/Pig.nc','x');
-y         = archread('../Data/Pig.nc','y');
-vx_obs    = archread('../Data/Pig.nc','vx_obs');
-vy_obs    = archread('../Data/Pig.nc','vy_obs');
-index     = archread('../Data/Pig.nc','index');
-surface   = archread('../Data/Pig.nc','surface');
-thickness = archread('../Data/Pig.nc','thickness');
+x         = archread('../Data/Pig.arch','x');
+y         = archread('../Data/Pig.arch','y');
+vx_obs    = archread('../Data/Pig.arch','vx_obs');
+vy_obs    = archread('../Data/Pig.arch','vy_obs');
+index     = archread('../Data/Pig.arch','index');
+surface   = archread('../Data/Pig.arch','surface');
+thickness = archread('../Data/Pig.arch','thickness');
 md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y);
 md.inversion.vy_obs   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/SquareSheetConstrained.par

@@ -13 +13 @@
 
 %Initial velocity 
-x     = archread('../Data/SquareSheetConstrained.nc','x');
-y     = archread('../Data/SquareSheetConstrained.nc','y');
-vx    = archread('../Data/SquareSheetConstrained.nc','vx');
-vy    = archread('../Data/SquareSheetConstrained.nc','vy');
-index = archread('../Data/SquareSheetConstrained.nc','index');
+x     = archread('../Data/SquareSheetConstrained.arch','x');
+y     = archread('../Data/SquareSheetConstrained.arch','y');
+vx    = archread('../Data/SquareSheetConstrained.arch','vx');
+vy    = archread('../Data/SquareSheetConstrained.arch','vy');
+index = archread('../Data/SquareSheetConstrained.arch','index');
 
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
@@ -41 +41 @@
 
 %Numerical parameters
-md.stressbalance.viscosity_overshoot=0.0;
+md.stressbal.arche.viscosity_overshoot=0.0;
 md.masstransport.stabilization=1.;
 md.thermal.stabilization=1.;
 md.verbose=verbose(0);
 md.settings.waitonlock=30;
-md.stressbalance.restol=0.05;
+md.stressbal.arche.restol=0.05;
 md.steadystate.reltol=0.05;
-md.stressbalance.reltol=0.05;
-md.stressbalance.abstol=NaN;
+md.stressbal.arche.reltol=0.05;
+md.stressbal.arche.abstol=NaN;
 md.timestepping.time_step=1.;
 md.timestepping.final_time=3.;

issm/trunk-jpl/test/Par/SquareSheetShelf.par

@@ -16 +16 @@
 
 %Initial velocity 
-x     = archread('../Data/SquareSheetShelf.nc','x');
-y     = archread('../Data/SquareSheetShelf.nc','y');
-vx    = archread('../Data/SquareSheetShelf.nc','vx');
-vy    = archread('../Data/SquareSheetShelf.nc','vy');
-index = archread('../Data/SquareSheetShelf.nc','index');
+x     = archread('../Data/SquareSheetShelf.arch','x');
+y     = archread('../Data/SquareSheetShelf.arch','y');
+vx    = archread('../Data/SquareSheetShelf.arch','vx');
+vy    = archread('../Data/SquareSheetShelf.arch','vy');
+index = archread('../Data/SquareSheetShelf.arch','index');
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
 md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/SquareShelf.par

@@ -13 +13 @@
 
 %Initial velocity and pressure
-x     = archread('../Data/SquareShelf.nc','x');
-y     = archread('../Data/SquareShelf.nc','y');
-vx    = archread('../Data/SquareShelf.nc','vx');
-vy    = archread('../Data/SquareShelf.nc','vy');
-index = archread('../Data/SquareShelf.nc','index');
+x     = archread('../Data/SquareShelf.arch','x');
+y     = archread('../Data/SquareShelf.arch','y');
+vx    = archread('../Data/SquareShelf.arch','vx');
+vy    = archread('../Data/SquareShelf.arch','vy');
+index = archread('../Data/SquareShelf.arch','index');
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
 md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/SquareShelf2.par

@@ -13 +13 @@
 
 %Initial velocity and pressure
-x     = archread('../Data/SquareShelf.nc','x');
-y     = archread('../Data/SquareShelf.nc','y');
-vx    = archread('../Data/SquareShelf.nc','vx');
-vy    = archread('../Data/SquareShelf.nc','vy');
-index = archread('../Data/SquareShelf.nc','index');
+x     = archread('../Data/SquareShelf.arch','x');
+y     = archread('../Data/SquareShelf.arch','y');
+vx    = archread('../Data/SquareShelf.arch','vx');
+vy    = archread('../Data/SquareShelf.arch','vy');
+index = archread('../Data/SquareShelf.arch','index');
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
 md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

issm/trunk-jpl/test/Par/SquareShelfConstrained.par

@@ -14 +14 @@
 
 %Initial velocity 
-x     = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'x');
-y     = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'y');
-vx    = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vx');
-vy    = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vy');
-index = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'index');
+x     = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'x');
+y     = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'y');
+vx    = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'vx');
+vy    = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'vy');
+index = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'index');
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
 md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);