Changeset 11190

Timestamp:

01/24/12 11:43:35 (13 years ago)

Author:

seroussi

Message:

fixing nightly runs

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive1106.mat (modified) ( previous)
• Archives/Archive1109.mat (modified) ( previous)
• Archives/Archive1110.mat (modified) ( previous)
• Exp/Square_10000.exp (added)
• Exp/Square_160000.exp (added)
• Exp/Square_20000.exp (added)
• Exp/Square_40000.exp (added)
• Exp/Square_5000.exp (added)
• Exp/Square_80000.exp (added)
• NightlyRun/test1106.m (modified) (2 diffs)

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

@@ -6 +6 @@
 
 for i=1:length(L_list),
-        L=3*L_list{i};  %in m (3 times the desired lenght for BC problems)  
-        nx=60; %number of nodes in x direction
-        ny=60;
-        md=model;
-        md=squaremesh(md,L,L,nx,ny);
+        L=L_list{i};  
+        md=triangle(model,['../Exp/Square_' num2str(L) '.exp'],L/10); %size 3*L 
         md=setmask(md,'',''); %ice sheet test
         md=parameterize(md,'../Par/ISMIPC.par');
-        md=extrude(md,6,1);
+        md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.mesh.x*2*pi/L).*sin(md.mesh.y*2*pi/L)));
+        md=extrude(md,10,1);
+
+        %Add spc on the borders
+        pos=find((md.mesh.x==0 | md.mesh.x==max(md.mesh.x) | md.mesh.y==0 | md.mesh.y==max(md.mesh.y)));
+        md.diagnostic.spcvx(pos)=0;
+        md.diagnostic.spcvy(pos)=0;
+        if(L==5000),
+                md.diagnostic.spcvx(pos)=15.66;
+                md.diagnostic.spcvy(pos)=-0.1967;
+        elseif(L==10000),
+                md.diagnostic.spcvx(pos)=16.04;
+                md.diagnostic.spcvy(pos)=-0.1977;
+        elseif(L==20000),
+                md.diagnostic.spcvx(pos)=16.53;
+                md.diagnostic.spcvy(pos)=-1.27;
+        elseif(L==40000),
+                md.diagnostic.spcvx(pos)=17.23;
+                md.diagnostic.spcvy(pos)=-3.17;
+        elseif(L==80000),
+                md.diagnostic.spcvx(pos)=16.68;
+                md.diagnostic.spcvy(pos)=-2.69;
+        elseif(L==160000),
+                md.diagnostic.spcvx(pos)=16.03;
+                md.diagnostic.spcvy(pos)=-1.27;
+        end
 
         md=setflowequation(md,'stokes','all'); 
 
-        %Create MPCs to have periodic boundary conditions
-
-        %posx=find(md.mesh.x==0);
-        %posx2=find(md.mesh.x==L);
-
-        %posy=find(md.mesh.y==0 & md.mesh.x~=0 & md.mesh.x~=L); %Don't take the same nodes two times
-        %posy2=find(md.mesh.y==L & md.mesh.x~=0 & md.mesh.x~=L);
-
-        %md.diagnostic.vertex_pairing=[posx,posx2;posy,posy2];
-
         %Compute the diagnostic
-        md.verbose=verbose('convergence',true,'solution',true);
         md.cluster=generic('name',oshostname(),'np',8);
         md=solve(md,DiagnosticSolutionEnum);
@@ -49 +60 @@
         'Vx80km','Vy80km','Vz80km',...
         'Vx160km','Vy160km','Vz160km'
-}
+};
 field_tolerances={...
         1e-12,1e-12,1e-12,...