Changeset 18371 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

08/13/14 08:49:22 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG:testing new cost function

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1355 +1355 @@
 
                         /*J = (H^2 - Hobs^2)^2*/
-                        J +=0.5*(thickness*thickness - thicknessobs*thicknessobs)*(thickness*thickness - thicknessobs*thicknessobs)*weight*Jdet*gauss->weight;
+                        //J +=0.5*(thickness*thickness - thicknessobs*thicknessobs)*(thickness*thickness - thicknessobs*thicknessobs)*weight*Jdet*gauss->weight;
                         /*J = phi^2*/
                         //J +=.5*potential*potential*weight*Jdet*gauss->weight;// OK
@@ -1361 +1361 @@
                         //J +=.5*(dpotential[0]*dpotential[0] + dpotential[1]*dpotential[1])*weight*Jdet*gauss->weight;
                         /*J = (ubar - nux*uobs)^2*/
-                        //J +=0.5*((vxbarobs - vxbar)*(vxbarobs - vxbar) + (vybarobs - vybar)*(vybarobs - vybar))*weight*Jdet*gauss->weight;
+                        J +=0.5*((vxbarobs - vxbar)*(vxbarobs - vxbar) + (vybarobs - vybar)*(vybarobs - vybar))*weight*Jdet*gauss->weight;
                 }