Changeset 18371

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG:testing new cost function

Location:

issm/trunk-jpl/src/c

Files:

• analyses/AdjointBalancethickness2Analysis.cpp (modified) (2 diffs)
• classes/FemModel.cpp (modified) (2 diffs)
• modules/FloatingiceMeltingRatex (modified) (1 prop)

issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp ¶

@@ -107 +107 @@
                                 case Balancethickness2MisfitEnum:
                                         /*J = (H^2 - Hobs^2)^2*/
-                                        for(i=0;i<numnodes;i++){
-
-                                                /*H^2 - Hobs^2*/
-                                                NUMxH2 = 2.*dbasis[0*numnodes+i]*dphi[0]*(dphi[0]*dphi[0] + dphi[1]*dphi[1] - hu2);
-                                                NUMyH2 = 2.*dbasis[1*numnodes+i]*dphi[1]*(dphi[0]*dphi[0] + dphi[1]*dphi[1] - hu2);
-                                                DENH2 = vbarobs2*vbarobs2+1.e-14;
-
-                                                /*Ubar-Ubar_obs*/
-                                                NUMxUbar = (vyobsbar*dphi[0]*dphi[1] - vxobsbar*dphi[1]*dphi[1])*vbarobs*dbasis[0*numnodes+i];
-                                                NUMyUbar = (vyobsbar*dphi[0]*dphi[0] - vxobsbar*dphi[0]*dphi[1])*vbarobs*dbasis[1*numnodes+i];
-                                                DENUbar  = pow(dphi[0]*dphi[0] + dphi[1]*dphi[1],3./2.)+1.e-14;
-
-                                                pe->values[i]+=(NUMxH2+NUMyH2)/DENH2 *weight*Jdet*gauss->weight;
-                                        }
+                                        //for(i=0;i<numnodes;i++){
+
+                                        //      /*H^2 - Hobs^2*/
+                                        //      NUMxH2 = 2.*dbasis[0*numnodes+i]*dphi[0]*(dphi[0]*dphi[0] + dphi[1]*dphi[1] - hu2);
+                                        //      NUMyH2 = 2.*dbasis[1*numnodes+i]*dphi[1]*(dphi[0]*dphi[0] + dphi[1]*dphi[1] - hu2);
+                                        //      DENH2 = vbarobs2*vbarobs2+1.e-14;
+
+                                        //      /*Ubar-Ubar_obs*/
+                                        //      NUMxUbar = (vyobsbar*dphi[0]*dphi[1] - vxobsbar*dphi[1]*dphi[1])*vbarobs*dbasis[0*numnodes+i];
+                                        //      NUMyUbar = (vyobsbar*dphi[0]*dphi[0] - vxobsbar*dphi[0]*dphi[1])*vbarobs*dbasis[1*numnodes+i];
+                                        //      DENUbar  = pow(dphi[0]*dphi[0] + dphi[1]*dphi[1],3./2.)+1.e-14;
+
+                                        //      pe->values[i]+=(NUMxH2+NUMyH2)/DENH2 *weight*Jdet*gauss->weight;
+                                        //}
                                         /*J = phi^2*/
                                         //for(i=0;i<numnodes;i++) pe->values[i]+= phi*basis[i]*weight*Jdet*gauss->weight; //OK
@@ -126 +126 @@
                                         //for(i=0;i<numnodes;i++) pe->values[i]+= (dphi[0]*dbasis[0*numnodes+i] + dphi[1]*dbasis[1*numnodes+i])*weight*Jdet*gauss->weight; //OK
                                         /*J = (ubar - nux*uobs)^2*/
-                                        //for(i=0;i<numnodes;i++) pe->values[i]+=(NUMxUbar-NUMyUbar)/DENUbar *weight*Jdet*gauss->weight;
+                                        for(i=0;i<numnodes;i++){
+                                                NUMxUbar = (vyobsbar*dphi[0]*dphi[1] - vxobsbar*dphi[1]*dphi[1])*vbarobs*dbasis[0*numnodes+i];
+                                                NUMyUbar = (vyobsbar*dphi[0]*dphi[0] - vxobsbar*dphi[0]*dphi[1])*vbarobs*dbasis[1*numnodes+i];
+                                                DENUbar  = pow(dphi[0]*dphi[0] + dphi[1]*dphi[1],3./2.)+1.e-14;
+                                                pe->values[i]+=(NUMxUbar-NUMyUbar)/DENUbar *weight*Jdet*gauss->weight;
+                                        }
                                         break;
                                 default:

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;
                 }
 

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex ¶

@@ -1 +1 @@
 .deps
+.dirstamp

@@ -1 +1 @@
 .deps
+.dirstamp

@@ -1 +1 @@
 .deps
+.dirstamp