Changeset 2350

Timestamp:

09/29/09 07:35:22 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed misfit error message: do not throw error if control_type=drag and shelf=1

File:

• issm/trunk/src/c/objects/Tria.cpp (modified) (1 diff)

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

@@ -2964 +2964 @@
                 
                 /*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 (strcmp(numpar->control_type,"drag")==0){
+                        if (!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;
+                        }
                 }
                 else if (strcmp(numpar->control_type,"B")==0){