Changeset 17441

Timestamp:

03/14/14 15:30:20 (11 years ago)

Author:

seroussi

Message:

CHG: trying to fix matlab test

File:

• issm/trunk-jpl/test/NightlyRun/test336.m (modified) (2 diffs)

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

@@ -1 +1 @@
 md=triangle(model(),'../Exp/Square.exp',100000.);
 md=setmask(md,'','');
-md=parameterize(md,'../Par/SquareSheetConstrained.py');
+md=parameterize(md,'../Par/SquareSheetConstrained.par');
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
@@ -14 +14 @@
 
 % init levelset function
-xmin, xmax=min(md.mesh.x), max(md.mesh.x)
-ymin, ymax=min(md.mesh.y), max(md.mesh.y)
-xmed, ymed=(xmax+xmin)/2.,(ymax+ymin)/2.  
-
-md.mask.ice_levelset=md.mesh.y - ymed
+ymed = (max(md.mesh.y)+min(md.mesh.y))/2;
+md.mask.ice_levelset=md.mesh.y - ymed;
 
 md=solve(md,TransientSolutionEnum())
 
 %Fields and tolerances to track changes
-field_names     ={'Vx','Vy','Vel','Pressure','Thickness','Surface','MaskIceLevelset'}
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
-                1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+field_names     ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',...
+                  'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',...
+                  'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'}
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+                1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
                 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}
-field_values={\
-        md.results.TransientSolution[0].Vx,\
-        md.results.TransientSolution[0].Vy,\
-        md.results.TransientSolution[0].Vel,\
-        md.results.TransientSolution[0].Pressure,\
-        md.results.TransientSolution[0].Thickness,\
-        md.results.TransientSolution[0].Surface,\
-        md.results.TransientSolution[0].MaskIceLevelset,\
-        md.results.TransientSolution[1].Vx,\
-        md.results.TransientSolution[1].Vy,\
-        md.results.TransientSolution[1].Vel,\
-        md.results.TransientSolution[1].Pressure,\
-        md.results.TransientSolution[1].Thickness,\
-        md.results.TransientSolution[1].Surface,\
-        md.results.TransientSolution[1].MaskIceLevelset,\
-        md.results.TransientSolution[2].Vx,\
-        md.results.TransientSolution[2].Vy,\
-        md.results.TransientSolution[2].Vel,\
-        md.results.TransientSolution[2].Pressure,\
-        md.results.TransientSolution[2].Thickness,\
-        md.results.TransientSolution[2].Surface,\
-        md.results.TransientSolution[2].MaskIceLevelset,\
+field_values={...
+        md.results.TransientSolution(1).Vx,...
+        md.results.TransientSolution(1).Vy,...
+        md.results.TransientSolution(1).Vel,...
+        md.results.TransientSolution(1).Pressure,...
+        md.results.TransientSolution(1).Thickness,...
+        md.results.TransientSolution(1).Surface,...
+        md.results.TransientSolution(1).MaskIceLevelset,...
+        md.results.TransientSolution(2).Vx,...
+        md.results.TransientSolution(2).Vy,...
+        md.results.TransientSolution(2).Vel,...
+        md.results.TransientSolution(2).Pressure,...
+        md.results.TransientSolution(2).Thickness,...
+        md.results.TransientSolution(2).Surface,...
+        md.results.TransientSolution(2).MaskIceLevelset,...
+        md.results.TransientSolution(3).Vx,...
+        md.results.TransientSolution(3).Vy,...
+        md.results.TransientSolution(3).Vel,...
+        md.results.TransientSolution(3).Pressure,...
+        md.results.TransientSolution(3).Thickness,...
+        md.results.TransientSolution(3).Surface,...
+        md.results.TransientSolution(3).MaskIceLevelset...
         }