Changeset 2347 for issm/trunk/src/c/objects/Tria.cpp

Timestamp:

09/28/09 16:37:13 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added noise dampening term to Misfit (required addition of control_type to Numpar)

File:

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

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

@@ -2840 +2840 @@
         const int    numdof=2*numgrids;
         const int    NDOF2=2;
+        int          dofs1[1]={0};
         int          dofs2[2]={0,1};
         double       xyz_list[numgrids][3];
@@ -2962 +2963 @@
                 #endif
                 
-
-
-                /*Initialize Jelem with dampening term*/
-                /* NOT working for NOW
-                if (strcmp(control_type,"drag")==0 & !shelf){
+                /*Add dampening term to misfit*/
+                if (strcmp(numpar->control_type,"drag")==0 & !shelf){
                         GetParameterDerivativeValue(&dk[0], &k[0],&xyz_list[0][0], gauss_l1l2l3);
                         Jelem+=numpar->cm_noisedampening*1/2*(pow(dk[0],2)+pow(dk[1],2))*Jdet*gauss_weight;
-                        if (id==1){
-                                printf("id=%i value=%g k=[%g %g %g]\n",id,(pow(dk[0],2)+pow(dk[1],2)),k[0],k[1],k[2]);
+                }
+                else if (strcmp(numpar->control_type,"B")==0){
+                        if(!inputs->Recover("B",&B[0],1,dofs1,numgrids,(void**)nodes)){
+                                throw ErrorException(__FUNCT__,"parameter B not found in input");
                         }
-                        if ((pow(dk[0],2)+pow(dk[1],2))>pow(10,-20)){
-                                printf("id=%i value=%g k=[%g %g %g]\n",id,(pow(dk[0],2)+pow(dk[1],2)),k[0],k[1],k[2]);
-                        }
-                }
-                else if (strcmp(control_type,"B")==0){
-                        B=matice->GetB();
                         GetParameterDerivativeValue(&dB[0], &B[0],&xyz_list[0][0], gauss_l1l2l3);
                         Jelem+=numpar->cm_noisedampening*1/2*(pow(dB[0],2)+pow(dB[1],2))*Jdet*gauss_weight;
                 }
-                */
+                else{
+                        throw ErrorException(__FUNCT__,exprintf("%s%s","unsupported control type: ",numpar->control_type));
+                }
 
                 /*Differents misfits are allowed: */