Changeset 8648

Timestamp:

06/16/11 14:30:18 (14 years ago)

Author:

Mathieu Morlighem

Message:

updated tests now that md.cm_noisedmp does not exist anymore

Location:

issm/trunk/test/NightlyRun

Files:

• test337.m (modified) (1 diff)
• test338.m (modified) (1 diff)
• test339.m (modified) (1 diff)
• test340.m (modified) (1 diff)
• test341.m (modified) (1 diff)
• test342.m (modified) (1 diff)
• test343.m (modified) (1 diff)
• test344.m (modified) (1 diff)
• test429.m (modified) (1 diff)
• test430.m (modified) (1 diff)
• test431.m (modified) (1 diff)
• test432.m (modified) (1 diff)
• test523.m (modified) (1 diff)
• test524.m (modified) (1 diff)
• test525.m (modified) (1 diff)
• test526.m (modified) (1 diff)

issm/trunk/test/NightlyRun/test337.m

@@ -10 +10 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=0*2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-%md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test338.m

@@ -10 +10 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test339.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test340.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test341.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceRelVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test342.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceRelVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test343.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test344.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test429.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.dt=0;
 md.vx_obs=md.vx; md.vy_obs=md.vy;

issm/trunk/test/NightlyRun/test430.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.dt=0;
 md.vx_obs=md.vx; md.vy_obs=md.vy;

issm/trunk/test/NightlyRun/test431.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceRelVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.dt=0;
 md.vx_obs=md.vx; md.vy_obs=md.vy;

issm/trunk/test/NightlyRun/test432.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceRelVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.3*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.dt=0;
 md.vx_obs=md.vx; md.vy_obs=md.vy;

issm/trunk/test/NightlyRun/test523.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.99*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test524.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.99*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 

issm/trunk/test/NightlyRun/test525.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.99*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 md.dt=0;

issm/trunk/test/NightlyRun/test526.m

@@ -11 +11 @@
 md.cm_max=200*ones(md.numberofnodes,1);
 md.nsteps=2;
-md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1);
-md.weights=ones(md.numberofnodes,1);
+md.cm_responses=[SurfaceLogVelMisfitEnum()*ones(md.nsteps,1)  DragCoefficientAbsGradientEnum*ones(md.nsteps,1)];
+md.weights=ones(md.numberofnodes,2); md.weights(:,2)=2*10^-7;
 md.optscal=3*ones(md.nsteps,1);
 md.maxiter=2*ones(md.nsteps,1);
 md.cm_jump=0.99*ones(md.nsteps,1);
-md.cm_noisedmp=2*10^-7;
 md.vx_obs=md.vx; md.vy_obs=md.vy;
 md.dt=0;