Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 5640)
+++ /issm/trunk/src/c/Makefile.am	(revision 5641)
@@ -79,4 +79,6 @@
 					./objects/Gauss/GaussTria.h\
 					./objects/Gauss/GaussTria.cpp\
+					./objects/Gauss/GaussPenta.h\
+					./objects/Gauss/GaussPenta.cpp\
 					./objects/Update.h\
 					./objects/Element.h\
@@ -634,4 +636,6 @@
 					./objects/Gauss/GaussTria.h\
 					./objects/Gauss/GaussTria.cpp\
+					./objects/Gauss/GaussPenta.h\
+					./objects/Gauss/GaussPenta.cpp\
 					./objects/Update.h\
 					./objects/Element.h\
Index: /issm/trunk/src/c/objects/Gauss/GaussPenta.cpp
===================================================================
--- /issm/trunk/src/c/objects/Gauss/GaussPenta.cpp	(revision 5641)
+++ /issm/trunk/src/c/objects/Gauss/GaussPenta.cpp	(revision 5641)
@@ -0,0 +1,226 @@
+/*!\file GaussPenta.c
+ * \brief: implementation of the GaussPenta object
+ */
+
+/*Include files: {{{1*/
+#include "./../objects.h"
+/*}}}*/
+
+/*GaussPenta constructors and destructors:*/
+/*FUNCTION GaussPenta::GaussPenta() {{{1*/
+GaussPenta::GaussPenta(){
+
+	numgauss=-1;
+
+	weights=NULL;
+	coords1=NULL;
+	coords2=NULL;
+	coords3=NULL;
+	coords4=NULL;
+
+	weight=UNDEF;
+	coord1=UNDEF;
+	coord2=UNDEF;
+	coord3=UNDEF;
+	coord4=UNDEF;
+}
+/*}}}*/
+/*FUNCTION GaussPenta::GaussPenta(int order_horiz,int order_vert) {{{1*/
+GaussPenta::GaussPenta(int order_horiz,int order_vert){
+
+	/*Intermediaries*/
+	int     ighoriz,igvert;
+	int     numgauss_horiz;
+	int     numgauss_vert;
+	double *coords1_horiz = NULL;
+	double *coords2_horiz = NULL;
+	double *coords3_horiz = NULL;
+	double *weights_horiz  = NULL;
+	double *coords_vert = NULL;
+	double *weights_vert   = NULL;
+
+	/*Get gauss points*/
+	GaussLegendreTria(&numgauss_horiz,&coords1_horiz,&coords2_horiz,&coords3_horiz,&weights_horiz,order_horiz);
+	GaussLegendreLinear(&coords_vert,&weights_vert,order_vert);
+	numgauss_vert=order_vert;
+
+	/*Allocate GaussPenta fields*/
+	numgauss=numgauss_horiz*numgauss_vert;
+	coords1=(double*)xmalloc(numgauss*sizeof(double));
+	coords2=(double*)xmalloc(numgauss*sizeof(double));
+	coords3=(double*)xmalloc(numgauss*sizeof(double));
+	coords4=(double*)xmalloc(numgauss*sizeof(double));
+	weights=(double*)xmalloc(numgauss*sizeof(double));
+
+	/*Combine Horizontal and vertical points*/
+	for (ighoriz=0; ighoriz<numgauss_horiz; ighoriz++){
+		for (igvert=0; igvert<numgauss_vert; igvert++){
+			coords1[numgauss_vert*ighoriz+igvert]=coords1_horiz[ighoriz];
+			coords2[numgauss_vert*ighoriz+igvert]=coords2_horiz[ighoriz];
+			coords3[numgauss_vert*ighoriz+igvert]=coords3_horiz[ighoriz];
+			coords4[numgauss_vert*ighoriz+igvert]=coords_vert[igvert];
+			weights[numgauss_vert*ighoriz+igvert]=weights_horiz[ighoriz]*weights_vert[igvert];
+		}
+	}
+
+	/*Initialize static fields as undefinite*/
+	weight=UNDEF;
+	coord1=UNDEF;
+	coord2=UNDEF;
+	coord3=UNDEF;
+	coord4=UNDEF;
+
+	/*Clean up*/
+	xfree((void**)&coords1_horiz);
+	xfree((void**)&coords2_horiz);
+	xfree((void**)&coords3_horiz);
+	xfree((void**)&coords_vert);
+	xfree((void**)&weights_horiz);
+	xfree((void**)&weights_vert);
+}
+/*}}}*/
+/*FUNCTION GaussPenta::~GaussPenta(){{{1*/
+GaussPenta::~GaussPenta(){
+	xfree((void**)&weights);
+	xfree((void**)&coords1);
+	xfree((void**)&coords2);
+	xfree((void**)&coords3);
+	xfree((void**)&coords4);
+}
+/*}}}*/
+
+/*Methods*/
+/*FUNCTION GaussPenta::Echo{{{1*/
+void GaussPenta::Echo(void){
+
+	printf("GaussPenta:\n");
+	printf("   numgauss: %i\n",numgauss);
+
+	if (weights){
+	 printf("   weights = ["); 
+	 for(int i=0;i<numgauss;i++) printf(" %g\n",weights[i]);
+	 printf("]\n");
+	}
+	else printf("weights = NULL\n");
+	if (coords1){
+	 printf("   coords1 = ["); 
+	 for(int i=0;i<numgauss;i++) printf(" %g\n",coords1[i]);
+	 printf("]\n");
+	}
+	else printf("coords1 = NULL\n");
+	if (coords2){
+	 printf("   coords2 = ["); 
+	 for(int i=0;i<numgauss;i++) printf(" %g\n",coords2[i]);
+	 printf("]\n");
+	}
+	else printf("coords2 = NULL\n");
+	if (coords3){
+	 printf("   coords3 = ["); 
+	 for(int i=0;i<numgauss;i++) printf(" %g\n",coords3[i]);
+	 printf("]\n");
+	}
+	else printf("coords3 = NULL\n");
+	if (coords4){
+		printf("   coords4 = ["); 
+		for(int i=0;i<numgauss;i++) printf(" %g\n",coords4[i]);
+		printf("]\n");
+	}
+	else printf("coords4 = NULL\n");
+
+	printf("   weight = %g\n",weight);
+	printf("   coord1 = %g\n",coord1);
+	printf("   coord2 = %g\n",coord2);
+	printf("   coord3 = %g\n",coord3);
+	printf("   coord4 = %g\n",coord4);
+
+}
+/*}}}*/
+/*FUNCTION GaussPenta::GaussCenter{{{1*/
+void GaussPenta::GaussCenter(void){
+
+	/*update static arrays*/
+	coord1=ONETHIRD;
+	coord2=ONETHIRD;
+	coord3=ONETHIRD;
+	coord4=0.0;
+
+}
+/*}}}*/
+/*FUNCTION GaussPenta::GaussPoint{{{1*/
+void GaussPenta::GaussPoint(int ig){
+
+	/*Check input in debugging mode*/
+	 ISSMASSERT(ig>=0 && ig< numgauss);
+
+	 /*update static arrays*/
+	 weight=weights[ig];
+	 coord1=coords1[ig];
+	 coord2=coords2[ig];
+	 coord3=coords3[ig];
+	 coord4=coords4[ig];
+
+}
+/*}}}*/
+/*FUNCTION GaussPenta::GaussVertex{{{1*/
+void GaussPenta::GaussVertex(int iv){
+
+	/*in debugging mode: check that the default constructor has been called*/
+	ISSMASSERT(numgauss==-1);
+
+	/*update static arrays*/
+	switch(iv){
+		case 0:
+			coord1=1; coord2=0; coord3=0; coord4= -1;
+			break;
+		case 1:
+			coord1=0; coord2=1; coord3=0; coord4= -1;
+			break;
+		case 2:
+			coord1=0; coord2=0; coord3=1; coord4= -1;
+			break;
+		case 3:
+			coord1=1; coord2=0; coord3=0; coord4= +1;
+			break;
+		case 4:
+			coord1=0; coord2=1; coord3=0; coord4= +1;
+			break;
+		case 5:
+			coord1=0; coord2=0; coord3=1; coord4= +1;
+			break;
+		default:
+			ISSMERROR("vertex index should be in [0 5]");
+
+	}
+
+}
+/*}}}*/
+/*FUNCTION GaussPenta::begin{{{1*/
+int GaussPenta::begin(void){
+
+	/*Check that this has been initialized*/
+	ISSMASSERT(numgauss>0);
+	ISSMASSERT(weights);
+	ISSMASSERT(coords1);
+	ISSMASSERT(coords2);
+	ISSMASSERT(coords3);
+	ISSMASSERT(coords4);
+
+	/*return first gauss index*/
+	return 0;
+}
+/*}}}*/
+/*FUNCTION GaussPenta::end{{{1*/
+int GaussPenta::end(void){
+
+	/*Check that this has been initialized*/
+	ISSMASSERT(numgauss>0);
+	ISSMASSERT(weights);
+	ISSMASSERT(coords1);
+	ISSMASSERT(coords2);
+	ISSMASSERT(coords3);
+	ISSMASSERT(coords4);
+
+	/*return last gauss index +1*/
+	return numgauss;
+}
+/*}}}*/
Index: /issm/trunk/src/c/objects/Gauss/GaussPenta.h
===================================================================
--- /issm/trunk/src/c/objects/Gauss/GaussPenta.h	(revision 5641)
+++ /issm/trunk/src/c/objects/Gauss/GaussPenta.h	(revision 5641)
@@ -0,0 +1,45 @@
+/*!\file GaussPenta.h
+ * \brief: header file for node object
+ */
+
+#ifndef _GAUSSPENTA_H_
+#define _GAUSSPENTA_H_
+
+/*Headers:*/
+/*{{{1*/
+#include "./../../shared/shared.h"
+/*}}}*/
+
+class GaussPenta{
+
+	private:
+		int numgauss;
+		double* weights;
+		double* coords1;
+		double* coords2;
+		double* coords3;
+		double* coords4;
+
+	public:
+		double weight;
+		double coord1;
+		double coord2;
+		double coord3;
+		double coord4;
+		
+	public:
+
+		/*GaussPenta constructors, destructors*/
+		GaussPenta();
+		GaussPenta(int order_horiz,int order_vert);
+		~GaussPenta();
+
+		/*Methods*/
+		int  begin(void);
+		int  end(void);
+		void Echo(void);
+		void GaussPoint(int ig);
+		void GaussVertex(int iv);
+		void GaussCenter(void);
+};
+#endif
Index: /issm/trunk/src/c/objects/Gauss/GaussTria.cpp
===================================================================
--- /issm/trunk/src/c/objects/Gauss/GaussTria.cpp	(revision 5640)
+++ /issm/trunk/src/c/objects/Gauss/GaussTria.cpp	(revision 5641)
@@ -26,20 +26,4 @@
 /*FUNCTION GaussTria::GaussTria(int order) {{{1*/
 GaussTria::GaussTria(int order){
-
-	/*Get gauss points*/
-	GaussLegendreTria(&numgauss,&coords1,&coords2,&coords3,&weights,order);
-
-	/*Initialize static fields as undefinite*/
-	weight=UNDEF;
-	coord1=UNDEF;
-	coord2=UNDEF;
-	coord3=UNDEF;
-
-}
-/*}}}*/
-/*FUNCTION GaussTria::GaussTria(int order,int node1,int node2) {{{1*/
-GaussTria::GaussTria(int order,int node1,int node2){
-
-	ISSMERROR("not implemented yet");
 
 	/*Get gauss points*/
Index: /issm/trunk/src/c/objects/Gauss/GaussTria.h
===================================================================
--- /issm/trunk/src/c/objects/Gauss/GaussTria.h	(revision 5640)
+++ /issm/trunk/src/c/objects/Gauss/GaussTria.h	(revision 5641)
@@ -31,5 +31,4 @@
 		GaussTria();
 		GaussTria(int order);
-		GaussTria(int order,int node1, int node2);
 		~GaussTria();
 
Index: /issm/trunk/src/c/objects/objects.h
===================================================================
--- /issm/trunk/src/c/objects/objects.h	(revision 5640)
+++ /issm/trunk/src/c/objects/objects.h	(revision 5641)
@@ -25,4 +25,5 @@
 /*Gauss*/
 #include "./Gauss/GaussTria.h"
+#include "./Gauss/GaussPenta.h"
 
 /*Loads: */