Changeset 9080

Timestamp:

07/20/11 07:29:50 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed NR with new spcthickness

Location:

issm/trunk/test

Files:

• NightlyRun/test131.m (modified) (1 diff)
• NightlyRun/test132.m (modified) (1 diff)
• NightlyRun/test133.m (modified) (1 diff)
• NightlyRun/test134.m (modified) (1 diff)
• NightlyRun/test625.m (modified) (1 diff)
• NightlyRun/test626.m (modified) (1 diff)
• Par/79North.par (modified) (2 diffs)

issm/trunk/test/NightlyRun/test131.m ¶

@@ -4 +4 @@
 %Add boundary conditions on thickness on the border
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(pos,2)=md.thickness(pos);
+md.spcthickness(pos)=md.thickness(pos);
 md=setelementstype(md,'macayeal','all');
 md.cluster=none;

issm/trunk/test/NightlyRun/test132.m ¶

@@ -4 +4 @@
 %Add boundary conditions on thickness on the border
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(pos,2)=md.thickness(pos);
+md.spcthickness(pos)=md.thickness(pos);
 md=setelementstype(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk/test/NightlyRun/test133.m ¶

@@ -5 +5 @@
 %Add boundary conditions on thickness on the border
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(pos,2)=md.thickness(pos);
+md.spcthickness(pos)=md.thickness(pos);
 md=setelementstype(md,'macayeal','all');
 md.cluster=none;

issm/trunk/test/NightlyRun/test134.m ¶

@@ -5 +5 @@
 %Add boundary conditions on thickness on the border
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(pos,2)=md.thickness(pos);
+md.spcthickness(pos)=md.thickness(pos);
 md=setelementstype(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk/test/NightlyRun/test625.m ¶

@@ -8 +8 @@
 md=modelextract(md,md.elementonicesheet);
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(:,2)=md.thickness;
+md.spcthickness(pos)=md.thickness(pos);
 
 %control parameters

issm/trunk/test/NightlyRun/test626.m ¶

@@ -8 +8 @@
 md=modelextract(md,md.elementonicesheet);
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(:,2)=md.thickness;
+md.spcthickness(pos)=md.thickness(pos);
 
 %control parameters

issm/trunk/test/Par/79North.par ¶

@@ -2 +2 @@
 
 %Geometry and observation
-load('./../Data/79North.data','-mat');
+load('../Data/79North.data','-mat');
 md.vx       =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
 md.vy       =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
@@ -44 +44 @@
 md=SetMarineIceSheetBC(md);
 pos=find(md.nodeonboundary);
-md.spcthickness(pos,1)=1;
-md.spcthickness(pos,2)=md.thickness(pos);
+md.spcthickness(pos)=md.thickness(pos);
 
 %Change name so that no test have the same name