Changeset 17398

Timestamp:

03/08/14 20:35:44 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: preparing Tetra elements

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (3 diffs)
• classes/Elements/Tetra.cpp (added)
• classes/Elements/Tetra.h (added)
• classes/Elements/TetraRef.cpp (added)
• classes/Elements/TetraRef.h (added)
• classes/classes.h (modified) (1 diff)
• classes/gauss/GaussTetra.cpp (added)
• classes/gauss/GaussTetra.h (added)
• classes/gauss/gaussobjects.h (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (3 diffs)
• shared/Enum/EnumToStringx.cpp (modified) (3 diffs)
• shared/Enum/StringToEnumx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -30 +30 @@
                                         ./classes/gauss/GaussTria.h\
                                         ./classes/gauss/GaussTria.cpp\
+                                        ./classes/gauss/GaussTetra.h\
+                                        ./classes/gauss/GaussTetra.cpp\
+                                        ./classes/gauss/GaussPenta.h\
+                                        ./classes/gauss/GaussPenta.cpp\
                                         ./classes/Update.h\
                                         ./classes/FemModel.h\
@@ -81 +85 @@
                                         ./classes/Elements/TriaRef.h\
                                         ./classes/Elements/TriaRef.cpp\
+                                        ./classes/Elements/Tetra.h\
+                                        ./classes/Elements/Tetra.cpp\
+                                        ./classes/Elements/TetraRef.h\
+                                        ./classes/Elements/TetraRef.cpp\
+                                        ./classes/Elements/Penta.h\
+                                        ./classes/Elements/Penta.cpp\
+                                        ./classes/Elements/PentaRef.h\
+                                        ./classes/Elements/PentaRef.cpp\
                                         ./classes/Inputs/Inputs.h\
                                         ./classes/Inputs/Inputs.cpp\
@@ -431 +443 @@
                                         ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\
                                         ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\
-                                        ./classes/gauss/GaussPenta.h\
-                                        ./classes/gauss/GaussPenta.cpp\
                                         ./classes/Inputs/PentaInput.h\
                                         ./classes/Inputs/PentaInput.cpp\
-                                        ./classes/Elements/Penta.h\
-                                        ./classes/Elements/Penta.cpp\
-                                        ./classes/Elements/PentaRef.h\
-                                        ./classes/Elements/PentaRef.cpp\
                                         #}}}
 #DAKOTA sources  {{{

issm/trunk-jpl/src/c/classes/classes.h ¶

@@ -45 +45 @@
 #include "./Elements/Tria.h"
 #include "./Elements/TriaRef.h"
+#include "./Elements/Tetra.h"
+#include "./Elements/TetraRef.h"
 #include "./Elements/ElementHook.h"
 

issm/trunk-jpl/src/c/classes/gauss/gaussobjects.h ¶

@@ -9 +9 @@
 #include "./GaussSeg.h"
 #include "./GaussTria.h"
+#include "./GaussTetra.h"
 #include "./GaussPenta.h"
 

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

@@ -415 +415 @@
         PengridEnum,
         PenpairEnum,
-        PentaEnum,
-        PentaInputEnum,
         ProfilerEnum,
         MatrixParamEnum,
@@ -434 +432 @@
         TriaEnum,
         TriaInputEnum,
+        TetraEnum,
+        TetraInputEnum,
+        PentaEnum,
+        PentaInputEnum,
         VertexEnum,
         VertexPIdEnum,
@@ -616 +618 @@
         GaussSegEnum,
         GaussTriaEnum,
+        GaussTetraEnum,
         GaussPentaEnum,
         /*}}}*/

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

@@ -410 +410 @@
                 case PengridEnum : return "Pengrid";
                 case PenpairEnum : return "Penpair";
-                case PentaEnum : return "Penta";
-                case PentaInputEnum : return "PentaInput";
                 case ProfilerEnum : return "Profiler";
                 case MatrixParamEnum : return "MatrixParam";
@@ -429 +427 @@
                 case TriaEnum : return "Tria";
                 case TriaInputEnum : return "TriaInput";
+                case TetraEnum : return "Tetra";
+                case TetraInputEnum : return "TetraInput";
+                case PentaEnum : return "Penta";
+                case PentaInputEnum : return "PentaInput";
                 case VertexEnum : return "Vertex";
                 case VertexPIdEnum : return "VertexPId";
@@ -591 +593 @@
                 case GaussSegEnum : return "GaussSeg";
                 case GaussTriaEnum : return "GaussTria";
+                case GaussTetraEnum : return "GaussTetra";
                 case GaussPentaEnum : return "GaussPenta";
                 case FSSolverEnum : return "FSSolver";

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

@@ -419 +419 @@
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
-              else if (strcmp(name,"Penta")==0) return PentaEnum;
-              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
               else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
@@ -438 +436 @@
               else if (strcmp(name,"Tria")==0) return TriaEnum;
               else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
+              else if (strcmp(name,"Tetra")==0) return TetraEnum;
+              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
+              else if (strcmp(name,"Penta")==0) return PentaEnum;
+              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
               else if (strcmp(name,"Vertex")==0) return VertexEnum;
               else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
@@ -504 +506 @@
               else if (strcmp(name,"VzHO")==0) return VzHOEnum;
               else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
-              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
-              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
+              if (strcmp(name,"VzFS")==0) return VzFSEnum;
+              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
+              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
               else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
@@ -603 +605 @@
               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
               else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
+              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
               else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
@@ -626 +629 @@
               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
               else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
-              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
-              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
-              else if (strcmp(name,"Regular")==0) return RegularEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Scaled")==0) return ScaledEnum;
+              if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
+              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
+              else if (strcmp(name,"Regular")==0) return RegularEnum;
+              else if (strcmp(name,"Scaled")==0) return ScaledEnum;
               else if (strcmp(name,"Separate")==0) return SeparateEnum;
               else if (strcmp(name,"Sset")==0) return SsetEnum;