Changeset 3189

Timestamp:

03/05/10 09:41:24 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Misfit 4

Location:

issm/trunk/src

Files:

• c/objects/Tria.cpp (modified) (2 diffs)
• m/classes/public/ismodelselfconsistent.m (modified) (1 diff)

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

@@ -3019 +3019 @@
                 }
         }
+        else if(fit==4){
+                /*We are using an logarithmic 2 misfit:
+                 *
+                 *      1            [        |u| + eps     2          |v| + eps     2  ]
+                 * J = --- \bar{v}^2 | log ( -----------  )   +  log ( -----------  )   |  
+                 *      2            [       |u    |+ eps              |v    |+ eps     ]
+                 *                              obs                       obs
+                 *        dJ                              1      u                             1
+                 * DU = - -- = - \bar{v}^2 log(u...) --------- ----  ~ - \bar{v}^2 log(u...) ------
+                 *        du                         |u| + eps  |u|                           u + eps
+                 */
+                for (i=0;i<numgrids;i++){
+                        dux_list[i] = - pow(numpar->meanvel,(double)2)*(
+                                                log((fabs(vx_list[i])+numpar->epsvel)/(fabs(obs_vx_list[i])+numpar->epsvel)) * 1/(vx_list[i]+numpar->epsvel));
+                        duy_list[i] = - pow(numpar->meanvel,(double)2)*(
+                                                log((fabs(vy_list[i])+numpar->epsvel)/(fabs(obs_vy_list[i])+numpar->epsvel)) * 1/(vy_list[i]+numpar->epsvel));
+                }
+        }
         else{
                 /*Not supported yet! : */
@@ -4589 +4607 @@
                 }
         }
+        else if(fit==4){
+                /*We are using an logarithmic 2 misfit:
+                 *
+                 *      1            [        |u| + eps     2          |v| + eps     2  ]
+                 * J = --- \bar{v}^2 | log ( -----------  )   +  log ( -----------  )   |  
+                 *      2            [       |u    |+ eps              |v    |+ eps     ]
+                 *                              obs                       obs
+                 */
+                for (i=0;i<numgrids;i++){
+                        misfit_list[i]=0.5*pow(numpar->meanvel,(double)2)*(
+                          pow(log((fabs(vx_list[i])+numpar->epsvel)/(fabs(obs_vx_list[i])+numpar->epsvel)),(double)2) +
+                          pow(log((fabs(vy_list[i])+numpar->epsvel)/(fabs(obs_vy_list[i])+numpar->epsvel)),(double)2) );
+                }
+        }
         else{
                 /*Not supported yet! : */

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -371 +371 @@
 
         %FIT
-        checkvalues(md,{'fit'},[0 1 2 3]);
+        checkvalues(md,{'fit'},[0 1 2 3 4]);
 
         %OBSERVED VELOCITIES