Changeset 8540

Timestamp:

06/07/11 16:45:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

back to normal

File:

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

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

@@ -885 +885 @@
                 if(slope_magnitude>MAXSLOPE) alpha2=pow((double)10,MOUNTAINKEXPONENT);
                 else friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum);
-                _assert_(alpha2>=0);
 
                 GetL(&L[0][0], &xyz_list[0][0], gauss,NDOF2);
@@ -1623 +1622 @@
                 for(i=0;i<numdof;i++) pe->values[i]+=(thicknessobs-thickness)*weight*Jdet*gauss->weight*l1l2l3[i];
                 /*Regularization of the constraint: 2000000 79 N*/
-                for(i=0;i<numdof;i++) pe->values[i]+= - 1*100000*dH[0]*dbasis[0][i]*Jdet*gauss->weight;
-                for(i=0;i<numdof;i++) pe->values[i]+= - 1*100000*dH[1]*dbasis[1][i]*Jdet*gauss->weight;
+                //for(i=0;i<numdof;i++) pe->values[i]+= - 1*100000*dH[0]*dbasis[0][i]*Jdet*gauss->weight;
+                //for(i=0;i<numdof;i++) pe->values[i]+= - 1*100000*dH[1]*dbasis[1][i]*Jdet*gauss->weight;
         }
 
@@ -5290 +5289 @@
                 /*compute ThicknessAbsMisfit*/
                 Jelem+=0.5*pow(thickness-thicknessobs,2.0)*weight*Jdet*gauss->weight;
-                Jelem+=0.5*100000*(pow(dH[0],2.)+pow(dH[1],2.))*Jdet*gauss->weight;
+                //Jelem+=0.5*100000*(pow(dH[0],2.)+pow(dH[1],2.))*Jdet*gauss->weight;
         }