Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/c/classes/Materials/Matpar.h

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/classes/Materials/Matpar.h (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/classes/Materials/Matpar.h ¶

@@ -77 +77 @@
                 Matpar(int matpar_id, IoModel* iomodel);
                 ~Matpar();
+                void SetMid(int matpar_mid);
 
                 /*Object virtual functions definitions:{{{ */
@@ -114 +115 @@
                 IssmDouble GetN(){_error_("not supported");};
                 bool       IsDamage(){_error_("not supported");};
+                bool       IsEnhanced(){_error_("not supported");};
                 void       ResetHooks();
 
@@ -123 +125 @@
                 void       ViscositySSA(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not supported");};
                 void       ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){_error_("not supported");};
+                void       ViscosityBFS(IssmDouble* pmudB,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not supported");};
+                void       ViscosityBHO(IssmDouble* pmudB,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not supported");};
+                void       ViscosityBSSA(IssmDouble* pmudB,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not supported");};
                 /*}}}*/
                 /*Numerics: {{{*/