Index: /issm/trunk/test/NightlyRun/test337.m
===================================================================
--- /issm/trunk/test/NightlyRun/test337.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test337.m	(revision 8648)
@@ -10,10 +10,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test338.m
===================================================================
--- /issm/trunk/test/NightlyRun/test338.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test338.m	(revision 8648)
@@ -10,10 +10,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test339.m
===================================================================
--- /issm/trunk/test/NightlyRun/test339.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test339.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test340.m
===================================================================
--- /issm/trunk/test/NightlyRun/test340.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test340.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test341.m
===================================================================
--- /issm/trunk/test/NightlyRun/test341.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test341.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test342.m
===================================================================
--- /issm/trunk/test/NightlyRun/test342.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test342.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test343.m
===================================================================
--- /issm/trunk/test/NightlyRun/test343.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test343.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test344.m
===================================================================
--- /issm/trunk/test/NightlyRun/test344.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test344.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test429.m
===================================================================
--- /issm/trunk/test/NightlyRun/test429.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test429.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
Index: /issm/trunk/test/NightlyRun/test430.m
===================================================================
--- /issm/trunk/test/NightlyRun/test430.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test430.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
Index: /issm/trunk/test/NightlyRun/test431.m
===================================================================
--- /issm/trunk/test/NightlyRun/test431.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test431.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
Index: /issm/trunk/test/NightlyRun/test432.m
===================================================================
--- /issm/trunk/test/NightlyRun/test432.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test432.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
Index: /issm/trunk/test/NightlyRun/test523.m
===================================================================
--- /issm/trunk/test/NightlyRun/test523.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test523.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test524.m
===================================================================
--- /issm/trunk/test/NightlyRun/test524.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test524.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
 
Index: /issm/trunk/test/NightlyRun/test525.m
===================================================================
--- /issm/trunk/test/NightlyRun/test525.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test525.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;
Index: /issm/trunk/test/NightlyRun/test526.m
===================================================================
--- /issm/trunk/test/NightlyRun/test526.m	(revision 8647)
+++ /issm/trunk/test/NightlyRun/test526.m	(revision 8648)
@@ -11,10 +11,9 @@
 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;