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

Timestamp:

01/07/14 13:05:28 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: putting together FS OneLayerz4 formulation

File:

• issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (modified) (8 diffs)

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

@@ -1452 +1452 @@
                         this->element_type = TaylorHoodEnum;
                         return;
+                case OneLayerP4zEnum:
+                        this->element_type = P2xP4Enum;
+                        this->GetNodalFunctions(basis,gauss);
+                        this->element_type = OneLayerP4zEnum;
+                        return;
                 default:
                         _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
@@ -1486 +1491 @@
                         this->GetNodalFunctions(basis,gauss);
                         this->element_type = TaylorHoodEnum;
+                        return;
+                case OneLayerP4zEnum:
+                        this->element_type = P1xP3Enum;
+                        this->GetNodalFunctions(basis,gauss);
+                        this->element_type = OneLayerP4zEnum;
                         return;
                 default:
@@ -1554 +1564 @@
                         this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
                         this->element_type = TaylorHoodEnum;
+                        return;
+                case OneLayerP4zEnum:
+                        this->element_type = P2xP4Enum;
+                        this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+                        this->element_type = OneLayerP4zEnum;
                         return;
                 default:
@@ -2252 +2267 @@
                 case MINIEnum:              return NUMNODESP1b+NUMNODESP1;
                 case TaylorHoodEnum:        return NUMNODESP2+NUMNODESP1;
+                case OneLayerP4zEnum:       return NUMNODESP2xP4+NUMNODESP1xP3;
                 case P2xP4Enum:             return NUMNODESP2xP4;
                 case P1xP3Enum:             return NUMNODESP1xP3;
@@ -2269 +2285 @@
                 case MINIEnum:          return NUMNODESP1;
                 case TaylorHoodEnum:    return NUMNODESP1;
+                case OneLayerP4zEnum:   return NUMNODESP1xP3;
                 default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }
@@ -2284 +2301 @@
                 case MINIEnum:          return NUMNODESP1b;
                 case TaylorHoodEnum:    return NUMNODESP2;
+                case OneLayerP4zEnum:   return NUMNODESP2xP4;
                 default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }
@@ -2299 +2317 @@
                 case MINIEnum:          return P1bubbleEnum;
                 case TaylorHoodEnum:    return P2Enum;
+                case OneLayerP4zEnum:   return P2xP4Enum;
                 default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }
@@ -2314 +2333 @@
                 case MINIEnum:          return P1Enum;
                 case TaylorHoodEnum:    return P1Enum;
+                case OneLayerP4zEnum:   return P1xP3Enum;
                 default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }