Changeset 13233

Timestamp:

09/04/12 10:53:47 (13 years ago)

Author:

seroussi

Message:

CHG: matlab parameter files now use .nc data files

Location:

issm/trunk-jpl/test/Par

Files:

• 79North.par (modified) (1 diff)
• ISMIPE.par (modified) (1 diff)
• Pig.par (modified) (1 diff)
• SquareSheetConstrained.par (modified) (1 diff)
• SquareSheetShelf.par (modified) (1 diff)
• SquareShelf.par (modified) (1 diff)
• SquareShelfConstrained.par (modified) (1 diff)

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

@@ -2 +2 @@
 
 %Geometry and observation
-load('../Data/79North.data','-mat');
+x=transpose(ncread('../Data/79North.nc','x'));
+y=transpose(ncread('../Data/79North.nc','y'));
+vx=transpose(ncread('../Data/79North.nc','vx'));
+vy=transpose(ncread('../Data/79North.nc','vy'));
+index=transpose(ncread('../Data/79North.nc','index'));
+surface=transpose(ncread('../Data/79North.nc','surface'));
+thickness=transpose(ncread('../Data/79North.nc','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/ISMIPE.par

@@ -2 +2 @@
 
 disp('      creating thickness');
-data=load('../Data/ISMIPE.data','-mat');
-data=data.data;
+data=transpose(ncread('../Data/ISMIPE.nc','data'));
 md.geometry.surface=zeros(md.mesh.numberofvertices,1);
 md.geometry.bed=zeros(md.mesh.numberofvertices,1);

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

@@ -2 +2 @@
 
 %Geometry and observation
-load('../Data/Pig.data','-mat');
+x=transpose(ncread('../Data/Pig.nc','x'));
+y=transpose(ncread('../Data/Pig.nc','y'));
+vx_obs=transpose(ncread('../Data/Pig.nc','vx_obs'));
+vy_obs=transpose(ncread('../Data/Pig.nc','vy_obs'));
+index=transpose(ncread('../Data/Pig.nc','index'));
+surface=transpose(ncread('../Data/Pig.nc','surface'));
+thickness=transpose(ncread('../Data/Pig.nc','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

@@ -11 +11 @@
 
 %Initial velocity 
-load('../Data/SquareSheetConstrained.data','-mat');
+x=transpose(ncread('../Data/SquareSheetConstrained.nc','x'));
+y=transpose(ncread('../Data/SquareSheetConstrained.nc','y'));
+vx=transpose(ncread('../Data/SquareSheetConstrained.nc','vx'));
+vy=transpose(ncread('../Data/SquareSheetConstrained.nc','vy'));
+index=transpose(ncread('../Data/SquareSheetConstrained.nc','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/SquareSheetShelf.par

@@ -14 +14 @@
 
 %Initial velocity 
-load('../Data/SquareSheetShelf.data','-mat');
+x=transpose(ncread('../Data/SquareSheetShelf.nc','x'));
+y=transpose(ncread('../Data/SquareSheetShelf.nc','y'));
+vx=transpose(ncread('../Data/SquareSheetShelf.nc','vx'));
+vy=transpose(ncread('../Data/SquareSheetShelf.nc','vy'));
+index=transpose(ncread('../Data/SquareSheetShelf.nc','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

@@ -11 +11 @@
 
 %Initial velocity and pressure
-load('../Data/SquareShelf.data','-mat');
+x=transpose(ncread('../Data/SquareShelf.nc','x'));
+y=transpose(ncread('../Data/SquareShelf.nc','y'));
+vx=transpose(ncread('../Data/SquareShelf.nc','vx'));
+vy=transpose(ncread('../Data/SquareShelf.nc','vy'));
+index=transpose(ncread('../Data/SquareShelf.nc','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

@@ -11 +11 @@
 
 %Initial velocity 
-load('../Data/SquareShelfConstrained.data','-mat');
+x=transpose(ncread('../Data/SquareShelfConstrained.nc','x'));
+y=transpose(ncread('../Data/SquareShelfConstrained.nc','y'));
+vx=transpose(ncread('../Data/SquareShelfConstrained.nc','vx'));
+vy=transpose(ncread('../Data/SquareShelfConstrained.nc','vy'));
+index=transpose(ncread('../Data/SquareShelfConstrained.nc','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);