Changeset 13669

Timestamp:

10/15/12 13:39:27 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW added tests 610 611 and 612

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test1401.m (modified) (1 diff)
• test1402.m (modified) (1 diff)
• test272.m (modified) (1 diff)
• test415.m (modified) (1 diff)
• test416.m (modified) (1 diff)
• test511.m (modified) (1 diff)
• test610.m (modified) (1 diff)
• test610.py (added)
• test611.m (modified) (3 diffs)
• test611.py (added)
• test612.m (modified) (3 diffs)
• test612.py (added)
• test613.m (modified) (3 diffs)

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

@@ -72 +72 @@
 
 %Fields and tolerances to track changes
-field_names     ={'xyams' 'yyams' 'xbamg' 'ybamg'};
-field_tolerances={1e-13 1e-13 1e-13 1e-13};
+field_names     ={'xyams','yyams','xbamg','ybamg'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13};
 field_values={...
         x1, y1,...

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

@@ -102 +102 @@
 
 %Fields and tolerances to track changes
-field_names     ={'xyams' 'yyams' 'xbamg' 'ybamg'};
-field_tolerances={1e-13 1e-13 1e-13 1e-13};
+field_names     ={'xyams','yyams','xbamg','ybamg'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13};
 field_values={...
         x1, y1,...

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

@@ -26 +26 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyZbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient','Misfits','MaterialsRheologyZbar','Pressure','Vel','Vx','Vy'};
 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...

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

@@ -23 +23 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'};
+field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
 field_tolerances={1e-10,1e-10,1e-11,1e-13,1e-10,1e-09,1e-10,1e-8,1e-09,1e-6};
 field_values={...

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

@@ -23 +23 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'};
+field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
 field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05};
 field_values={...

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

@@ -27 +27 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient','Misfits','MaterialsRheologyB','Pressure','Vel','Vx','Vy'};
 field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...

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

@@ -1 @@
-md=triangle(model(),'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000.);
 md=setmask(md,'../Exp/79NorthShelf.exp','');
 md=parameterize(md,'../Par/79North.par');
-md=extrude(md,3,1);
+md=extrude(md,3,1.);
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);

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

@@ -1 @@
-md=triangle(model(),'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000.);
 md=setmask(md,'../Exp/79NorthShelf.exp','');
 md=parameterize(md,'../Par/79North.par');
@@ -10 +10 @@
 md.inversion.control_parameters={'BalancethicknessThickeningRate'};
 md.inversion.thickness_obs=md.geometry.thickness;
-md.inversion.min_parameters=-50*ones(md.mesh.numberofvertices,1);
-md.inversion.max_parameters=50*ones(md.mesh.numberofvertices,1);
+md.inversion.min_parameters=-50.*ones(md.mesh.numberofvertices,1);
+md.inversion.max_parameters=50.*ones(md.mesh.numberofvertices,1);
 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
-md.inversion.gradient_scaling=10/md.constants.yts*ones(md.inversion.nsteps,1);
+md.inversion.gradient_scaling=10./md.constants.yts*ones(md.inversion.nsteps,1);
 md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1);
 md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'};
+field_names     ={'Gradient','Misfits','BalancethicknessThickeningRate','Thickness'};
 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...

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

@@ -1 @@
-md=triangle(model(),'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000.);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');
@@ -11 +11 @@
 md.inversion.control_parameters={'BalancethicknessThickeningRate'};
 md.inversion.thickness_obs=md.geometry.thickness;
-md.inversion.min_parameters=-50*ones(md.mesh.numberofvertices,1);
-md.inversion.max_parameters=50*ones(md.mesh.numberofvertices,1);
+md.inversion.min_parameters=-50.*ones(md.mesh.numberofvertices,1);
+md.inversion.max_parameters=50.*ones(md.mesh.numberofvertices,1);
 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
-md.inversion.gradient_scaling=10/md.constants.yts*ones(md.inversion.nsteps,1);
+md.inversion.gradient_scaling=10./md.constants.yts*ones(md.inversion.nsteps,1);
 md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1);
 md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
@@ -23 +23 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'};
+field_names     ={'Gradient','Misfits','BalancethicknessThickeningRate','Thickness'};
 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...

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

@@ -1 @@
-md=triangle(model(),'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000.);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');
@@ -15 +15 @@
 md.inversion.thickness_obs=md.geometry.thickness;
 md.inversion.nsteps=2;
-md.inversion.control_parameters={'Vx' 'Vy'};
+md.inversion.control_parameters={'Vx','Vy'};
 md.balancethickness.stabilization=1;
-md.inversion.gradient_scaling=[10/md.constants.yts*ones(md.inversion.nsteps,1) 10/md.constants.yts*ones(md.inversion.nsteps,1)];
-md.inversion.min_parameters=[-2000*ones(md.mesh.numberofvertices,1) -2000*ones(md.mesh.numberofvertices,1)];
-md.inversion.max_parameters=[+2000*ones(md.mesh.numberofvertices,1) +2000*ones(md.mesh.numberofvertices,1)];
+md.inversion.gradient_scaling=[10./md.constants.yts*ones(md.inversion.nsteps,1) 10./md.constants.yts*ones(md.inversion.nsteps,1)];
+md.inversion.min_parameters=[-2000.*ones(md.mesh.numberofvertices,1) -2000.*ones(md.mesh.numberofvertices,1)];
+md.inversion.max_parameters=[+2000.*ones(md.mesh.numberofvertices,1) +2000.*ones(md.mesh.numberofvertices,1)];
 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
@@ -30 +30 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'};
+field_names     ={'Gradient1','Gradient2','Misfits','Vx','Vy','Thickness'};
 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
 field_values={...