Changeset 14107

Timestamp:

12/07/12 14:05:59 (12 years ago)

Author:

jschierm

Message:

NEW: Working python tests 1201-1204, 1208.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• python_skipped_tests.txt (modified) (1 diff)
• test1201.m (modified) (5 diffs)
• test1201.py (added)
• test1202.m (modified) (2 diffs)
• test1202.py (added)
• test1203.m (modified) (4 diffs)
• test1203.py (added)
• test1204.m (modified) (4 diffs)
• test1204.py (added)
• test1208.m (modified) (2 diffs)
• test1208.py (added)

issm/trunk-jpl/test/NightlyRun/python_skipped_tests.txt

@@ -11 +11 @@
 test418    needs Dakota
 test420    needs Dakota
-test1401    roundoff error in metric causes different meshes from matlab
-test1402    roundoff error in metric causes different meshes from matlab
+
+test1401,test1402
+Roundoff error in ComputeHessian and ComputeMetric causes different meshes
+from matlab, specifically in the handling of 0/0=nan, eps/0=inf, etc.  Since
+the mesh is of a different size, NR fails.  (Note Matlab test1402 currently
+fails.)
+
+test1205,test1206,test1207
+The expression for the thickness in the RoundSheetStaticEISMINT.par/py files
+includes an expression (1/2)^(4/3)-(r/(2*rmax))^(4/3).  For r close to rmax,
+the outer circumference, this equals roundoff zero, but differences
+propagate into the sixth digit of the thickness, which is enough to fail NR.
+

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

@@ -6 +6 @@
 for stabilization=1:3;
         %The goal is to test the prognostic model
-        md=bamg(model(),'domain','../Exp/SquareEISMINT.exp','hmax',3000);
+        md=bamg(model(),'domain','../Exp/SquareEISMINT.exp','hmax',3000.);
         md=setmask(md,'all','');
         md=parameterize(md,'../Par/SquareEISMINT.par');
-        md.surfaceforcings.mass_balance(:)=0;
+        md.surfaceforcings.mass_balance(:)=0.;
         md=setflowequation(md,'macayeal','all');
         md.cluster=generic('name',oshostname(),'np',8);
@@ -15 +15 @@
         disp('      initial velocity');
         md.initialization.vx=zeros(md.mesh.numberofvertices,1);
-        md.initialization.vy=-400*ones(md.mesh.numberofvertices,1);
+        md.initialization.vy=-400.*ones(md.mesh.numberofvertices,1);
 
         %Stabilization
@@ -29 +29 @@
         md.prognostic.spcthickness=NaN*ones(md.mesh.numberofvertices+1,length(times));
         md.prognostic.spcthickness(end,:)=times;
-        md.prognostic.spcthickness(pos,:)=repmat(500+100*sin(2*pi*times/200),length(pos),1);
+        md.prognostic.spcthickness(pos,:)=repmat(500.+100.*sin(2.*pi*times/200.),length(pos),1);
         if stabilization==3,
-                pos=find(isnan(md.prognostic.spcthickness)); md.prognostic.spcthickness(pos)=500; %No NaN for DG
+                pos=find(isnan(md.prognostic.spcthickness)); md.prognostic.spcthickness(pos)=500.; %No NaN for DG
         end
 
@@ -43 +43 @@
 
 %plot results
-[elements,x,y,z,s,h1]=SectionValues(md,results{1},'../Exp/CrossLineEISMINT.exp',100);
-[elements,x,y,z,s,h2]=SectionValues(md,results{2},'../Exp/CrossLineEISMINT.exp',100);
-[elements,x,y,z,s,h3]=SectionValues(md,results{3},'../Exp/CrossLineEISMINT.exp',100);
-[elements,x,y,z,s,hth]=SectionValues(md, 500+100*sin(2*pi/200*(500-md.mesh.y/400)),'../Exp/CrossLineEISMINT.exp',100);
+[elements,x,y,z,s,h1]=SectionValues(md,results{1},'../Exp/CrossLineEISMINT.exp',100.);
+[elements,x,y,z,s,h2]=SectionValues(md,results{2},'../Exp/CrossLineEISMINT.exp',100.);
+[elements,x,y,z,s,h3]=SectionValues(md,results{3},'../Exp/CrossLineEISMINT.exp',100.);
+[elements,x,y,z,s,hth]=SectionValues(md, 500+100*sin(2*pi/200*(500-md.mesh.y/400)),'../Exp/CrossLineEISMINT.exp',100.);
 plot(s,h1,'r',s,h2,'b',s,h3,'g',s,hth,'k')
 legend('Art. diff.','No Art. diff.','D.G.','Theoretical')
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         export_fig([issmdir() '/website/doc_pdf/validation/Images/EISMINT/IceShelf/eismintmasscthickness.pdf']);
@@ -56 +56 @@
 %Fields and tolerances to track changes
 field_names     ={ ...
-        'ThicknessArtDigg','ThicknessNoArtDiff','ThicknessDG' ...
+        'ThicknessArtDiff','ThicknessNoArtDiff','ThicknessDG' ...
 };
 field_tolerances={...

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

@@ -19 +19 @@
 plotmodel(md,'data',vx,'contourlevels',{0,20,40,60,60,100,120,140,160,180,-20,-40,-60,-80,-100,-120,-140,-160,-180}, ...
         'contourcolor','k')
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eismintdiag1vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
@@ -27 +27 @@
 plotmodel(md,'data',vy,'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800,-900,-1000},...
         'contourcolor','k')
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eismintdiag1vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');

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

@@ -2 +2 @@
 printingflag=false;
 
-%test 5 and 6 : 
+%test 5 and 6: 
 md=model();
 md=triangle(md,'../Exp/SquareEISMINT.exp',5100.); %test3
@@ -11 +11 @@
 %Impose a non zero velocity on the upper boundary condition (y=max(y))
 pos=find(md.mesh.y==max(md.mesh.y));
-md.diagnostic.spcvy(pos)=400*(((md.mesh.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000)/25000).^2);
+md.diagnostic.spcvy(pos)=400.*(((md.mesh.x(pos)-100000.)/25000.).^2-ones(size(pos,1),1)).*heaviside((1.+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000.)/25000.).^2);
 
 %Compute solution for MacAyeal's model 
@@ -23 +23 @@
 plotmodel(md,'data',vx,'contourlevels',{0,20,40,60,80,100,-20,-40,-60,-80,-100},...
         'contourcolor','k')
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eismintdiag2vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
@@ -30 +30 @@
 plotmodel(md,'data',vy,'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800,-900,-1000},...
         'contourcolor','k')
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eismintdiag2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');

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

@@ -11 +11 @@
 %Impose a non zero velocity on the upper boundary condition (y=max(y))
 pos=find(md.mesh.y==max(md.mesh.y));
-md.diagnostic.spcvy(pos)=400*(((md.mesh.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000)/25000).^2);
+md.diagnostic.spcvy(pos)=400.*(((md.mesh.x(pos)-100000.)/25000.).^2-ones(size(pos,1),1)).*heaviside((1.+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000.)/25000.).^2);
 
 %Compute solution for MacAyeal's model 
@@ -21 +21 @@
 md.initialization.vy=(md.results.DiagnosticSolution.Vy);
 
-md.timestepping.time_step=1;
-md.timestepping.final_time=5000;
+md.timestepping.time_step=1.;
+md.timestepping.final_time=5000.;
 md.prognostic.stabilization=1;
 md=solve(md,TransientSolutionEnum());
 
 plotmodel(md,'data',(md.results.TransientSolution(end).Vx))
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eisminttrans2vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
@@ -34 +34 @@
 
 plotmodel(md,'data',(md.results.TransientSolution(end).Vy))
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eisminttrans2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
@@ -41 +41 @@
 
 plotmodel(md,'data',(md.results.TransientSolution(end).Thickness))
-if printingflag, 
+if printingflag,
         set(gcf,'Color','w')
         printmodel('eisminttrans2thickness','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');

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

@@ -1 +1 @@
 %EISMINT benchmark experiment A
 numlayers=8;
-resolution=50000;
+resolution=50000.;
 
 %To begin with the numerical model
@@ -14 +14 @@
 %Spc the nodes on the bed
 pos=find(md.mesh.vertexonbed);
-md.diagnostic.spcvx(pos)=0;
-md.diagnostic.spcvy(pos)=0;
-md.diagnostic.spcvz(pos)=0;
+md.diagnostic.spcvx(pos)=0.;
+md.diagnostic.spcvy(pos)=0.;
+md.diagnostic.spcvz(pos)=0.;
 
 %Adapt the time steps to the resolution
-md.timestepping.time_step=15;
+md.timestepping.time_step=15.;
 md.settings.output_frequency=500;
-md.timestepping.final_time=30000;
+md.timestepping.final_time=30000.;
 md.prognostic.stabilization=1;
 md.thermal.stabilization=1;