Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 17875)
@@ -1927,10 +1927,10 @@
 /*FUNCTION Penta::NumberofNodesPressure{{{*/
 int Penta::NumberofNodesPressure(void){
-	return PentaRef::NumberofNodesPressure();
+	return PentaRef::NumberofNodes(this->PressureInterpolation());
 }
 /*}}}*/
 /*FUNCTION Penta::NumberofNodesVelocity{{{*/
 int Penta::NumberofNodesVelocity(void){
-	return PentaRef::NumberofNodesVelocity();
+	return PentaRef::NumberofNodes(this->VelocityInterpolation());
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp	(revision 17875)
@@ -1096,36 +1096,4 @@
 }
 /*}}}*/
-/*FUNCTION PentaRef::NumberofNodesPressure{{{*/
-int PentaRef::NumberofNodesPressure(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1;
-		case MINIEnum:          return NUMNODESP1;
-		case TaylorHoodEnum:    return NUMNODESP1;
-		case OneLayerP4zEnum:   return NUMNODESP1;
-		default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
-/*FUNCTION PentaRef::NumberofNodesVelocity{{{*/
-int PentaRef::NumberofNodesVelocity(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1b;
-		case MINIEnum:          return NUMNODESP1b;
-		case TaylorHoodEnum:    return NUMNODESP2;
-		case OneLayerP4zEnum:   return NUMNODESP2xP4;
-		default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
 /*FUNCTION PentaRef::VelocityInterpolation{{{*/
 int PentaRef::VelocityInterpolation(void){
Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h	(revision 17875)
@@ -49,6 +49,4 @@
 		int  NumberofNodes(void);
 		int  NumberofNodes(int finiteelement);
-		int  NumberofNodesVelocity(void);
-		int  NumberofNodesPressure(void);
 		int  VelocityInterpolation(void);
 		int  PressureInterpolation(void);
Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp	(revision 17875)
@@ -694,10 +694,10 @@
 /*FUNCTION Tetra::NumberofNodesPressure{{{*/
 int Tetra::NumberofNodesPressure(void){
-	return TetraRef::NumberofNodesPressure();
+	return TetraRef::NumberofNodes(this->PressureInterpolation());
 }
 /*}}}*/
 /*FUNCTION Tetra::NumberofNodesVelocity{{{*/
 int Tetra::NumberofNodesVelocity(void){
-	return TetraRef::NumberofNodesVelocity();
+	return TetraRef::NumberofNodes(this->VelocityInterpolation());
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Elements/TetraRef.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/TetraRef.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/TetraRef.cpp	(revision 17875)
@@ -420,34 +420,4 @@
 }
 /*}}}*/
-/*FUNCTION TetraRef::NumberofNodesPressure{{{*/
-int TetraRef::NumberofNodesPressure(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1;
-		case MINIEnum:          return NUMNODESP1;
-		case TaylorHoodEnum:    return NUMNODESP1;
-		default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
-/*FUNCTION TetraRef::NumberofNodesVelocity{{{*/
-int TetraRef::NumberofNodesVelocity(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1b;
-		case MINIEnum:          return NUMNODESP1b;
-		case TaylorHoodEnum:    return NUMNODESP2;
-		default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
 /*FUNCTION TetraRef::VelocityInterpolation{{{*/
 int TetraRef::VelocityInterpolation(void){
Index: /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h	(revision 17875)
@@ -39,6 +39,4 @@
 		int  NumberofNodes(void);
 		int  NumberofNodes(int finiteelement);
-		int  NumberofNodesVelocity(void);
-		int  NumberofNodesPressure(void);
 		int  VelocityInterpolation(void);
 		int  PressureInterpolation(void);
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 17875)
@@ -1711,10 +1711,10 @@
 /*FUNCTION Tria::NumberofNodesPressure{{{*/
 int Tria::NumberofNodesPressure(void){
-	return TriaRef::NumberofNodesPressure();
+	return TriaRef::NumberofNodes(this->PressureInterpolation());
 }
 /*}}}*/
 /*FUNCTION Tria::NumberofNodesVelocity{{{*/
 int Tria::NumberofNodesVelocity(void){
-	return TriaRef::NumberofNodesVelocity();
+	return TriaRef::NumberofNodes(this->VelocityInterpolation());
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp	(revision 17875)
@@ -454,36 +454,4 @@
 		case XTaylorHoodEnum:       return NUMNODESP2+NUMNODESP1;
 		default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
-/*FUNCTION TriaRef::NumberofNodesPressure{{{*/
-int TriaRef::NumberofNodesPressure(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1;
-		case MINIEnum:          return NUMNODESP1;
-		case TaylorHoodEnum:    return NUMNODESP1;
-		case XTaylorHoodEnum:   return NUMNODESP1;
-		default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
-	}
-
-	return -1;
-}
-/*}}}*/
-/*FUNCTION TriaRef::NumberofNodesVelocity{{{*/
-int TriaRef::NumberofNodesVelocity(void){
-
-	switch(this->element_type){
-		case P1P1Enum:          return NUMNODESP1;
-		case P1P1GLSEnum:       return NUMNODESP1;
-		case MINIcondensedEnum: return NUMNODESP1b;
-		case MINIEnum:          return NUMNODESP1b;
-		case TaylorHoodEnum:    return NUMNODESP2;
-		case XTaylorHoodEnum:   return NUMNODESP2;
-		default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
 	}
 
Index: /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h	(revision 17874)
+++ /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h	(revision 17875)
@@ -43,6 +43,4 @@
 		int  NumberofNodes(void);
 		int  NumberofNodes(int finiteelement);
-		int  NumberofNodesVelocity(void);
-		int  NumberofNodesPressure(void);
 		int  VelocityInterpolation(void);
 		int  PressureInterpolation(void);