Changeset 17097

Timestamp:

01/10/14 14:49:04 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added basal node indices for P2xP4

File:

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

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

@@ -1247 +1247 @@
                         indices[1] = 1;
                         indices[2] = 2;
-                        break;
+                        return;
                 case P1bubbleEnum: case P1bubblecondensedEnum:
                         numindices = 3;
@@ -1254 +1254 @@
                         indices[1] = 1;
                         indices[2] = 2;
-                        break;
+                        return;
                 case P2xP1Enum:
                         numindices = 6;
@@ -1264 +1264 @@
                         indices[4] = 7;
                         indices[5] = 8;
-                        break;
+                        return;
                 case P1xP2Enum:
+                        numindices = 3;
+                        indices    = xNew<int>(numindices);
+                        indices[0] = 0;
+                        indices[1] = 1;
+                        indices[2] = 2;
+                        return;
+                case P1xP3Enum:
                         numindices = 3;
                         indices    = xNew<int>(numindices);
@@ -1281 +1288 @@
                         indices[4] = 10;
                         indices[5] = 11;
-                        break;
+                        return;
+                case P2xP4Enum:
+                        numindices = 6;
+                        indices    = xNew<int>(numindices);
+                        indices[0] = 0;
+                        indices[1] = 1;
+                        indices[2] = 2;
+                        indices[3] = 9;
+                        indices[4] = 10;
+                        indices[5] = 11;
+                        return;
                 default:
                         _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");