Changeset 11527 for issm/trunk/src/c/objects/Materials/Matice.h

Timestamp:

02/24/12 08:12:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/objects/Materials/Matice.h (modified) (1 diff)

issm/trunk/src/c

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

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

@@ -68 +68 @@
                 void   GetViscosity3dStokes(double* pviscosity3d, double* epsilon);
                 void   GetViscosityComplement(double* pviscosity_complement, double* pepsilon);
+                void   GetViscosityDerivativeEpsSquare(double* pmu_prime, double* pepsilon);
+                void   GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* pepsilon);
                 double GetB();
                 double GetBbar();

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*