Changeset 17806 for issm/trunk/src/c/classes/gauss/GaussTria.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/gauss/GaussTria.h (modified) (4 diffs)

issm/trunk/src/c

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

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

issm/trunk/src/c/classes/gauss/GaussTria.h

@@ -8 +8 @@
 /*Headers:*/
 #include "../../shared/Numerics/types.h"
+#include "./Gauss.h"
 
-class GaussTria{
+class GaussTria: public Gauss{
 
         private:
@@ -19 +20 @@
 
         public:
-                IssmDouble weight;
                 IssmDouble coord1;
                 IssmDouble coord2;
@@ -38 +38 @@
                 int  end(void);
                 void Echo(void);
+                int  Enum(void);
                 void GaussFromCoords(IssmDouble x1,IssmDouble y1,IssmDouble* xyz_list);
                 void GaussPoint(int ig);
@@ -43 +44 @@
                 void GaussNode(int finitelement,int iv);
                 void GaussEdgeCenter(int index1,int index2);
+                void SynchronizeGaussBase(Gauss* gauss);
 };
 #endif  /* _GAUSSTRIA_H_ */

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