Changeset 16560 for issm/trunk/src/c/classes/Materials/Matice.h

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

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

issm/trunk/src/c/classes/Materials/Matice.h ¶

@@ -54 +54 @@
                 void       SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 void       GetViscosity2d(IssmDouble* pviscosity, IssmDouble* pepsilon);
+                void       GetViscosity2dvertical(IssmDouble* pviscosity, IssmDouble* pepsilon);
                 void       GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* pepsilon);
                 void       GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon);
                 void       GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon);
-                void GetViscosityZComplement(IssmDouble*, IssmDouble*){_error_("not supported");};
+                void       GetViscosityDComplement(IssmDouble*, IssmDouble*);
                 void       GetViscosityDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon);
                 void       GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* pepsilon);
@@ -64 +65 @@
                 IssmDouble GetB();
                 IssmDouble GetBbar();
-                IssmDouble GetZ(){_error_("not supported");};
-                IssmDouble GetZbar(){_error_("not supported");};
+                IssmDouble GetD();
+                IssmDouble GetDbar();
                 IssmDouble GetN();
                 bool       IsInput(int name);