Changeset 18301 for issm/trunk/src/c/classes/Materials/Material.h

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

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

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

@@ -26 +26 @@
                 virtual void       Configure(Elements* elements)=0;
                 virtual void       GetViscosity(IssmDouble* pviscosity,IssmDouble epseff)=0;
+                virtual void       GetViscosity_B(IssmDouble* pviscosity,IssmDouble epseff)=0;
+                virtual void       GetViscosity_D(IssmDouble* pviscosity,IssmDouble epseff)=0;
                 virtual void       GetViscosityBar(IssmDouble* pviscosity,IssmDouble epseff)=0;
                 virtual void       GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon)=0;
@@ -39 +41 @@
                 virtual IssmDouble GetDbar()=0;
                 virtual bool       IsDamage()=0;
+                virtual void       ResetHooks()=0;
 
 };