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

Timestamp:

06/22/09 14:46:26 (16 years ago)

Author:

Mathieu Morlighem

Message:

renamed viscosity2 as viscosity_complement (cf alpha_complement)

File:

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

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

@@ -2451 +2451 @@
 
         /* parameters: */
-        double  viscosity2;
+        double  viscosity_complement;
         double  dvx[NDOF2];
         double  dvy[NDOF2]; 
@@ -2509 +2509 @@
                 GetStrainRate(&epsilon[0],&vxvy_list[0][0],&xyz_list[0][0],gauss_l1l2l3);
         
-                /*Get viscosity2: */
-                matice->GetViscosity2(&viscosity2, &epsilon[0]);
+                /*Get viscosity complement: */
+                matice->GetViscosityComplement(&viscosity_complement, &epsilon[0]);
                 
                 /*Get dvx, dvy, dadjx and dadjx: */
@@ -2524 +2524 @@
                 GetNodalFunctions(l1l2l3, gauss_l1l2l3);
                 #ifdef _DEBUG_
-                        _printf_("viscosity2 %g thickness %g dvx [%g %g] dvy [%g %g]  dadjx [%g %g] dadjy[%g %g]\n",viscosity2,thickness,dvx[0],dvx[1],dvy[0],dvy[1],dadjx[0],dadjx[1],dadjy[0],dadjy[1]);
+                        _printf_("viscositycomp %g thickness %g dvx [%g %g] dvy [%g %g]  dadjx [%g %g] dadjy[%g %g]\n",viscosity_complement,thickness,dvx[0],dvx[1],dvy[0],dvy[1],dadjx[0],dadjx[1],dadjy[0],dadjy[1]);
                 #endif
 
                 /*Build gradje_g_gaussian vector (actually -dJ/dB): */
                 for (i=0;i<numgrids;i++){
-                        grade_g_gaussian[i]=-viscosity2*thickness*( (2*dvx[0]+dvy[1])*2*dadjx[0]+(dvx[1]+dvy[0])*(dadjx[1]+dadjy[0])+(2*dvy[1]+dvx[0])*2*dadjy[1])*Jdet*gauss_weight*l1l2l3[i]; 
+                        grade_g_gaussian[i]=-viscosity_complement*thickness*( (2*dvx[0]+dvy[1])*2*dadjx[0]+(dvx[1]+dvy[0])*(dadjx[1]+dadjy[0])+(2*dvy[1]+dvx[0])*2*dadjy[1])*Jdet*gauss_weight*l1l2l3[i]; 
                 }