Changeset 17875

Timestamp:

04/29/14 10:18:44 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying reference elements for FS

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (1 diff)
• PentaRef.cpp (modified) (1 diff)
• PentaRef.h (modified) (1 diff)
• Tetra.cpp (modified) (1 diff)
• TetraRef.cpp (modified) (1 diff)
• TetraRef.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• TriaRef.cpp (modified) (1 diff)
• TriaRef.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1927 +1927 @@
 /*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());
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

@@ -1096 +1096 @@
 }
 /*}}}*/
-/*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){

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

@@ -49 +49 @@
                 int  NumberofNodes(void);
                 int  NumberofNodes(int finiteelement);
-                int  NumberofNodesVelocity(void);
-                int  NumberofNodesPressure(void);
                 int  VelocityInterpolation(void);
                 int  PressureInterpolation(void);

issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

@@ -694 +694 @@
 /*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());
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/TetraRef.cpp

@@ -420 +420 @@
 }
 /*}}}*/
-/*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){

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

@@ -39 +39 @@
                 int  NumberofNodes(void);
                 int  NumberofNodes(int finiteelement);
-                int  NumberofNodesVelocity(void);
-                int  NumberofNodesPressure(void);
                 int  VelocityInterpolation(void);
                 int  PressureInterpolation(void);

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -1711 +1711 @@
 /*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());
 }
 /*}}}*/

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

@@ -454 +454 @@
                 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");
         }
 

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

@@ -43 +43 @@
                 int  NumberofNodes(void);
                 int  NumberofNodes(int finiteelement);
-                int  NumberofNodesVelocity(void);
-                int  NumberofNodesPressure(void);
                 int  VelocityInterpolation(void);
                 int  PressureInterpolation(void);