Changeset 18078 for issm/trunk-jpl/src/c/classes/Elements/TriaRef.h

Timestamp:

05/31/14 23:49:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved element_type to element rather than reference element

File:

• issm/trunk-jpl/src/c/classes/Elements/TriaRef.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/TriaRef.h

@@ -12 +12 @@
 
         public: 
-                int* element_type_list; //P1CG, P1DG, MINI, P2...
-                int  element_type;
-
                 TriaRef();
-                TriaRef(const int nummodels);
                 ~TriaRef();
-
-                /*Management*/
-                void SetElementType(int type,int type_counter);
 
                 /*Numerics*/
@@ -27 +20 @@
                 void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss);
                 void GetJacobianInvert(IssmDouble*  Jinv, IssmDouble* xyz_list,Gauss* gauss);
-                void GetNodalFunctions(IssmDouble* basis,Gauss* gauss);
                 void GetNodalFunctions(IssmDouble* basis,Gauss* gauss,int finiteelement);
-                void GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss, int index1,int index2);
-                void GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2);
-                void GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2);
-                void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss);
+                void GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss, int index1,int index2,int finiteelement);
+                void GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2,int finiteelement);
+                void GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2,int finiteelement);
                 void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement);
-                void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss);
                 void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement);
-                void GetInputValue(IssmDouble* pp, IssmDouble* plist, Gauss* gauss);
                 void GetInputValue(IssmDouble* pp, IssmDouble* plist, Gauss* gauss,int finiteelement);
-                void GetInputDerivativeValue(IssmDouble* pp, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss);
+                void GetInputDerivativeValue(IssmDouble* pp, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss,int finiteelement);
 
                 void NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement);
-                int  NumberofNodes(void);
                 int  NumberofNodes(int finiteelement);
-                int  VelocityInterpolation(void);
-                int  PressureInterpolation(void);
-                int  TensorInterpolation(void);
+                int  VelocityInterpolation(int fe_stokes);
+                int  PressureInterpolation(int fe_stokes);
+                int  TensorInterpolation(int fe_stokes);
 };
 #endif