Changeset 1051

Timestamp:

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

Author:

Mathieu Morlighem

Message:

renamed viscosity2 as viscosity_complement (cf alpha_complement)

Location:

issm/trunk/src/c/objects

Files:

• Friction.h (modified) (1 diff)
• Matice.cpp (modified) (3 diffs)
• Matice.h (modified) (1 diff)
• Tria.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Friction.h

@@ -27 +27 @@
 
         Friction*       NewFriction(void);
-        int                 FrictionInit(Friction* friction);
-        void        DeleteFriction(Friction** pfriction);
+        int     FrictionInit(Friction* friction);
+        void  DeleteFriction(Friction** pfriction);
         void  FrictionGetAlpha2(double* alpha2, Friction* friction);
         void  FrictionGetAlphaComplement(double* alpha_complement, Friction* friction);

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

@@ -195 +195 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__ "MatIce::GetViscosity2"
-void  Matice::GetViscosity2(double* pviscosity2, double* epsilon){
+#define __FUNCT__ "MatIce::GetViscosityComplement"
+void  Matice::GetViscosityComplement(double* pviscosity_complement, double* epsilon){
 
         /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: 
@@ -212 +212 @@
         
         /*output: */
-        double viscosity2;
+        double viscosity_complement;
 
         /*input strain rate: */
@@ -228 +228 @@
                 A=pow(exx,2)+pow(eyy,2)+pow(exy,2)+exx*eyy;
                 if(A==0){
-                        /*Maximum viscosity2 for 0 shear areas: */
-                        viscosity2=4.5*pow(10,17);
+                        /*Maximum viscosity_complement for 0 shear areas: */
+                        viscosity_complement=4.5*pow(10,17);
                 }
                 else{
                         e=(n-1)/2/n;
                 
-                        viscosity2=1/(2*pow(A,e));
+                        viscosity_complement=1/(2*pow(A,e));
                 }
         }
         else{
-                viscosity2=4.5*pow(10,17);
+                viscosity_complement=4.5*pow(10,17);
         }
                 
         #ifdef _DEBUG_
-        _printf_("Viscosity2 %lf\n",mu2);
+        _printf_("viscosity_complement %lf\n",mu2);
         #endif
 
         /*Return: */
-        *pviscosity2=viscosity2;
+        *pviscosity_complement=viscosity_complement;
 }
 

issm/trunk/src/c/objects/Matice.h

@@ -34 +34 @@
                 void  SetB(double B_param);
                 void  GetViscosity2d(double* pviscosity, double* pepsilon);
-                void  GetViscosity2(double* pviscosity2, double* pepsilon);
                 void  GetViscosity3d(double* pviscosity3d, double* pepsilon);
                 void  GetViscosity3dStokes(double* pviscosity3d, double* epsilon);
+                void  GetViscosityComplement(double* pviscosity_complement, double* pepsilon);
                 Object* copy();
                 double GetB();

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]; 
                 }