Changeset 15492

Timestamp:

07/15/13 16:33:43 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: changes finite element names

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/PentaRef.cpp (modified) (1 diff)
• c/classes/Elements/TriaRef.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (3 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/P1P2Enum.m (deleted)
• m/enum/P1bubbleEnum.m (added)
• m/enum/P2xP1Enum.m (added)

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

@@ -1102 +1102 @@
                         basis[5]=gauss->coord3*(1.+gauss->coord4)/2.;
                         return;
-                case P1xP2Enum:
+                case P2xP1Enum:
+                        /*Corner nodes*/
+                        basis[ 0]=0.;
+                        basis[ 1]=0.;
+                        basis[ 2]=0.;
+                        basis[ 3]=0.;
+                        basis[ 4]=0.;
+                        basis[ 5]=0.;
+                        /*mid-sides of quads*/
+                        basis[ 6]=0.;
+                        basis[ 7]=0.;
+                        basis[ 8]=0.;
+                        /*mid-sides of triangles*/
+                        basis[ 9]=0.;
+                        basis[10]=0.;
+                        basis[11]=0.;
+                        basis[12]=0.;
+                        basis[13]=0.;
+                        basis[14]=0.;
                 case MINIEnum:
                         basis[0]=gauss->coord1*(1.-gauss->coord4)/2.;

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

@@ -438 +438 @@
                         return;
                 case P2Enum:
+                        /*Corner nodes*/
                         basis[0]=gauss->coord1*(2.*gauss->coord1-1.);
                         basis[1]=gauss->coord2*(2.*gauss->coord2-1.);
                         basis[2]=gauss->coord3*(2.*gauss->coord3-1.);
+                        /*Mid-sides*/
                         basis[3]=4.*gauss->coord3*gauss->coord2;
                         basis[4]=4.*gauss->coord3*gauss->coord1;

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -497 +497 @@
         P0Enum,
         P1Enum,
+        P1DGEnum,
+        P1bubbleEnum,
         P2Enum,
-        P1DGEnum,
-        P1P2Enum,
+        P2xP1Enum,
         MINIEnum,
         TaylorHoodEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -489 +489 @@
                 case P0Enum : return "P0";
                 case P1Enum : return "P1";
+                case P1DGEnum : return "P1DG";
+                case P1bubbleEnum : return "P1bubble";
                 case P2Enum : return "P2";
-                case P1DGEnum : return "P1DG";
-                case P1P2Enum : return "P1P2";
+                case P2xP1Enum : return "P2xP1";
                 case MINIEnum : return "MINI";
                 case TaylorHoodEnum : return "TaylorHood";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -498 +498 @@
               else if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
+              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
               else if (strcmp(name,"P2")==0) return P2Enum;
-              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
-              else if (strcmp(name,"P1P2")==0) return P1P2Enum;
+              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
               else if (strcmp(name,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
-              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
+              if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+              else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -6617 +6617 @@
         return StringToEnum('P1')[0]
 
+def P1DGEnum():
+        """
+        P1DGENUM - Enum of P1DG
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=P1DGEnum()
+        """
+
+        return StringToEnum('P1DG')[0]
+
+def P1bubbleEnum():
+        """
+        P1BUBBLEENUM - Enum of P1bubble
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=P1bubbleEnum()
+        """
+
+        return StringToEnum('P1bubble')[0]
+
 def P2Enum():
         """
@@ -6631 +6659 @@
         return StringToEnum('P2')[0]
 
-def P1DGEnum():
-        """
-        P1DGENUM - Enum of P1DG
-
-        WARNING: DO NOT MODIFY THIS FILE
-                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
-                                Please read src/c/shared/Enum/README for more information
-
-           Usage:
-              macro=P1DGEnum()
-        """
-
-        return StringToEnum('P1DG')[0]
-
-def P1P2Enum():
-        """
-        P1P2ENUM - Enum of P1P2
-
-        WARNING: DO NOT MODIFY THIS FILE
-                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
-                                Please read src/c/shared/Enum/README for more information
-
-           Usage:
-              macro=P1P2Enum()
-        """
-
-        return StringToEnum('P1P2')[0]
+def P2xP1Enum():
+        """
+        P2XP1ENUM - Enum of P2xP1
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=P2xP1Enum()
+        """
+
+        return StringToEnum('P2xP1')[0]
 
 def MINIEnum():
@@ -7889 +7903 @@
         """
 
-        return 562
-
+        return 563
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=562;
+macro=563;