Changeset 3833 for issm/trunk/src/c/objects/Loads/Friction.h

Timestamp:

05/18/10 21:22:39 (15 years ago)

Author:

Eric.Larour

Message:

Moved Friction2, now that it compiles, to Friction

File:

• issm/trunk/src/c/objects/Loads/Friction.h (modified) (1 diff)

issm/trunk/src/c/objects/Loads/Friction.h ¶

@@ -1 @@
-/*! \file Friction.h
- *  \brief Friction object, interface, declaration
+/*!\file Friction.h
+ * \brief: header file for friction object
  */
 
-#ifndef _FRICTION_H
-#define _FRICTION_H
+#ifndef _FRICTION_H_
+#define _FRICTION_H_
 
-/*!Friction declaration: */
-struct Friction {
+/*Headers:*/
+/*{{{1*/
+class Inputs;
+class Matpar;
+/*}}}*/
 
-        char*   element_type;
-        double  gravity;
-        double  rho_ice;
-        double  rho_water;
-        double* K;
-        double* bed;
-        double* thickness;
-        double* vx;
-        double* vy;
-        double* vz;
-        double  p;
-        double  q;
-        int     analysis_type;
+class Friction{
+
+        public:
+
+                char* element_type;
+                Inputs* inputs;
+                Matpar* matpar;
+
+                /*methods: */
+                Friction();
+                Friction(char* element_type, Inputs* inputs,Matpar* matpar);
+                ~Friction();
+        
+                void  Echo(void);
+                void  GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum);
+                void  GetAlphaComplement(double* alpha_complement, double* gauss,int vxenum,int vyenum);
 
 };
 
-
-/* creation, initialisation: */
-
-        Friction*       NewFriction(void);
-        int     FrictionInit(Friction* friction);
-        void  DeleteFriction(Friction** pfriction);
-        void  FrictionGetAlpha2(double* alpha2, Friction* friction);
-        void  FrictionGetAlphaComplement(double* alpha_complement, Friction* friction);
-        void  FrictionEcho(Friction* friction);
-
-#endif  /* _FRICTION_H */
-
+#endif  /* _FRICTION_H_ */