Changeset 17806 for issm/trunk/src/c/classes/Node.h

Timestamp:

04/22/14 10:39:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17804

Location:

issm/trunk

Files:

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

issm/trunk/src/c

@@ -16 +16 @@
 .deps
 .dirstamp
+.libs

@@ -16 +16 @@
 .deps
 .dirstamp
+.libs

issm/trunk/src/c/classes/Node.h

@@ -56 +56 @@
                 int   Sid(void); 
                 int   Lid(void); 
-#ifdef _HAVE_STRESSBALANCE_
                 void  GetCoordinateSystem(IssmDouble* coord_system_out);
-#endif
                 bool  InAnalysis(int analysis_enum);
                 int   GetApproximation();
@@ -91 +89 @@
 int* GetGlobalDofList(Node** nodes,int numnodes,int setenum,int approximation);
 int  GetNumberOfDofs(Node** nodes,int numnodes,int setenum,int approximation);
-#ifdef _HAVE_STRESSBALANCE_
-void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum);
-void TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array);
-void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int cs_enum);
-void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array);
-void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int cs_enum);
-void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array);
-void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum);
-void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array);
-void CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes,int numnodes,int* cs_array);
-#endif
 
 #endif  /* _NODE_H_ */

@@ -16 +16 @@
 .deps
 .dirstamp
+.libs