Changeset 8539

Timestamp:

06/07/11 16:43:09 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor bug

Location:

issm/trunk/src/c

Files:

• objects/Elements/Tria.cpp (modified) (5 diffs)
• objects/Materials/Matpar.cpp (modified) (1 diff)
• shared/Matlab/PrintfFunction.cpp (modified) (1 diff)
• solutions/issm.cpp (modified) (1 diff)

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);
@@ -1622 +1623 @@
                 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]*weight*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;
         }
 
@@ -5257 +5258 @@
         double     xyz_list[NUMVERTICES][3];
         GaussTria *gauss = NULL;
+        double     dbasis[NDOF2][NUMVERTICES]; 
+        double     dH[2];
 
         /*If on water, return 0: */
@@ -5277 +5280 @@
                 /* Get Jacobian determinant: */
                 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss);
+                GetNodalFunctionsDerivatives(&dbasis[0][0],&xyz_list[0][0],gauss);
 
                 /*Get parameters at gauss point*/
                 thickness_input->GetParameterValue(&thickness,gauss);
+                thickness_input->GetParameterDerivativeValue(&dH[0],&xyz_list[0][0],gauss);
                 thicknessobs_input->GetParameterValue(&thicknessobs,gauss);
                 weights_input->GetParameterValue(&weight,gauss);
@@ -5285 +5290 @@
                 /*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;
         }
 

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -410 +410 @@
 /*}}}1*/
 /*FUNCTION Matqar::GetHydroQ {{{1*/
-double Matqar::GetHydroQ(){
+double Matpar::GetHydroQ(){
         return hydro_q;
 }

issm/trunk/src/c/shared/Matlab/PrintfFunction.cpp

@@ -52 +52 @@
         }
 
-        /*Ok, if we are running in paralle, get node 0 to print*/
+        /*Ok, if we are running in parallel, get node 0 to print*/
 #if defined(_PARALLEL_)
         if(my_rank==0)printf(buffer);

issm/trunk/src/c/solutions/issm.cpp

@@ -82 +82 @@
         if(control_analysis){
                 #ifdef _HAVE_TAO_
-                solutioncore=&controltao_core;
+                //solutioncore=&controltao_core;
+                solutioncore=&control_core;
                 #else
                 solutioncore=&control_core;