Changeset 483 for issm/trunk/src/c/objects/Friction.cpp

Timestamp:

05/18/09 16:55:54 (16 years ago)

Author:

Eric.Larour

Message:

Finished thermal and melting elemnets, as well as thermal constraints

File:

• issm/trunk/src/c/objects/Friction.cpp (modified) (2 diffs)

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

@@ -72 +72 @@
         double  velocity_x[numgrids];
         double  velocity_y[numgrids];
+        double  velocity_z[numgrids];
         double  velocity_mag[numgrids];
 
@@ -90 +91 @@
 
                 //We need the velocity magnitude to evaluate the basal stress:
-                velocity_x[i]=*(friction->velocities+2*i+0); //velocities of size numgridsx2
-                velocity_y[i]=*(friction->velocities+2*i+1);
-                velocity_mag[i]=sqrt(pow(velocity_x[i],2)+pow(velocity_y[i],2));
+                if(strcmp(friction->element_type,"2d")){
+                        velocity_x[i]=*(friction->velocities+2*i+0); //velocities of size numgridsx2
+                        velocity_y[i]=*(friction->velocities+2*i+1);
+                        velocity_mag[i]=sqrt(pow(velocity_x[i],2)+pow(velocity_y[i],2));
+                }
+                else{
+                        velocity_x[i]=*(friction->velocities+3*i+0); //velocities of size numgridsx3
+                        velocity_y[i]=*(friction->velocities+3*i+1);
+                        velocity_z[i]=*(friction->velocities+3*i+2);
+                        velocity_mag[i]=sqrt(pow(velocity_x[i],2)+pow(velocity_y[i],2)+pow(velocity_z[i],2));
+                }
         
                 alpha2[i]=pow(friction->K[i],2)*pow(Neff[i],r)*pow(velocity_mag[i],(s-1));