Changeset 11890

Timestamp:

04/04/12 06:55:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added ContourEnum

Location:

issm/trunk-jpl/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• modules/modules.h (modified) (1 diff)

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

@@ -235 +235 @@
         BoolInputEnum,
         BoolParamEnum,
+        ContourEnum,
         ControlInputEnum,
         DatasetInputEnum,

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

@@ -825 +825 @@
                         ./modules/NodeConnectivityx/NodeConnectivityx.cpp\
                         ./modules/NodeConnectivityx/NodeConnectivityx.h\
+                        ./modules/TriMeshx/TriMeshx.cpp\
+                        ./modules/TriMeshx/TriMeshx.h\
                         ./modules/ElementConnectivityx/ElementConnectivityx.cpp\
                         ./modules/ElementConnectivityx/ElementConnectivityx.h\

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -231 +231 @@
                 case BoolInputEnum : return "BoolInput";
                 case BoolParamEnum : return "BoolParam";
+                case ContourEnum : return "Contour";
                 case ControlInputEnum : return "ControlInput";
                 case DatasetInputEnum : return "DatasetInput";

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -235 +235 @@
               else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
               else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
+              else if (strcmp(name,"Contour")==0) return ContourEnum;
               else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
@@ -259 +260 @@
               else if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
-              else if (strcmp(name,"Param")==0) return ParamEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
+              if (strcmp(name,"Param")==0) return ParamEnum;
+              else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
@@ -382 +383 @@
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
               else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;

issm/trunk-jpl/src/c/modules/modules.h

@@ -111 +111 @@
 #include "./TimeAdaptx/TimeAdaptx.h"
 #include "./TriaSearchx/TriaSearchx.h"
+#include "./TriMeshx/TriMeshx.h"
 #include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
 #include "./ThicknessAbsGradientx/ThicknessAbsGradientx.h"