Changeset 2349

Timestamp:

09/28/09 17:06:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed gradient sign of dampening part

File:

• issm/trunk/src/c/objects/Tria.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Tria.cpp

@@ -2396 +2396 @@
                         grade_g_gaussian[i]=
                           -2*drag*alpha_complement*((lambda*vx+mu*vy))*Jdet*gauss_weight*l1l2l3[i]                         //standard term dJ/dki
-                          +numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);  // regularization term d/dki(1/2*(dk/dx)^2)
+                          -numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);  // regularization term d/dki(1/2*(dk/dx)^2)
                 }
                 
@@ -2619 +2619 @@
 
                         //Add regularization term
-                        grade_g_gaussian[i]+=numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);
+                        grade_g_gaussian[i]-=numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);
                 }
 
@@ -2809 +2809 @@
 
                         //Add regularization term
-                        grade_g_gaussian[i]+=numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);
+                        grade_g_gaussian[i]-=numpar->cm_noisedampening*Jdet*gauss_weight*(dh1dh2dh3_basic[0][i]*dk[0]+dh1dh2dh3_basic[1][i]*dk[1]);
                 }