Changeset 16137 for issm/trunk/src/c/classes/Materials/Matpar.h

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes (modified) (1 prop)
• src/c/classes/Materials (modified) (1 prop)
• src/c/classes/Materials/Matpar.h (modified) (2 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/classes/Materials/Matpar.h

@@ -71 +71 @@
                 /*Update virtual functions resolution: {{{*/
                 void   InputUpdateFromVector(IssmDouble* vector, int name, int type);
-                void   InputUpdateFromVector(int* vector, int name, int type);
-                void   InputUpdateFromVector(bool* vector, int name, int type);
                 void   InputUpdateFromMatrixDakota(IssmDouble* matrix,int nrows,int ncols, int name, int type);
                 void   InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type);
-                void   InputUpdateFromVectorDakota(int* vector, int name, int type);
-                void   InputUpdateFromVectorDakota(bool* vector, int name, int type);
                 void   InputUpdateFromConstant(IssmDouble constant, int name);
                 void   InputUpdateFromConstant(int constant, int name);
@@ -89 +85 @@
                 void       GetViscosity2d(IssmDouble* pviscosity, IssmDouble* pepsilon){_error_("not supported");};
                 void       GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* pepsilon){_error_("not supported");};
-                void       GetViscosity3dStokes(IssmDouble* pviscosity3d, IssmDouble* epsilon){_error_("not supported");};
+                void       GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon){_error_("not supported");};
                 void       GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon){_error_("not supported");};
                 void       GetViscosityZComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon){_error_("not supported");};
                 void       GetViscosityDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");};
+                void       GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");};
                 void       GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");};
                 IssmDouble GetA(){_error_("not supported");};

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp