Changeset 2571

Timestamp:

10/30/09 09:55:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed Stokes on COSMOS Youhouvim Penta.cppvim Penta.cpp

Location:

issm/trunk/src/c/objects

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (2 diffs)

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

@@ -807 +807 @@
         double     D[8][8]={0.0};
         double     D_scalar;
-        double     tBD[numdof][8];
+        double     tBD[27][8];
         double     DLStokes[14][14]={0.0};
         double     tLDStokes[numdof2d][14];

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

@@ -1451 +1451 @@
         
         //Update material if necessary
-        if(inputs->Recover("temperature_average",&temperature_list[0],1,dofs,3,(void**)nodes)){
+        if(inputs->Recover("temperature_average",&temperature_list[0],1,dofs,3,(void**)nodes) && !shelf){
                 temperature_average=(temperature_list[0]+temperature_list[1]+temperature_list[2])/3.0;
                 B_average=Paterson(temperature_average);
@@ -3013 +3013 @@
                                 Jelem+=numpar->cm_noisedmp*1/2*(pow(dk[0],2)+pow(dk[1],2))*Jdet*gauss_weight;
 
-                                //min dampening
-                                GetParameterValue(&k_gauss, &k[0],gauss_l1l2l3);
-                                if(k_gauss<numpar->cm_mindmp_value){ 
-                                        Jelem+=numpar->cm_mindmp_slope*k_gauss*Jdet*gauss_weight;
-                                }
-
-                                //max dampening
-                                if(k_gauss>numpar->cm_maxdmp_value){ 
-                                        Jelem+=numpar->cm_maxdmp_slope*k_gauss*Jdet*gauss_weight;
-                                }
                         }
                 }