Changeset 23946

Timestamp:

05/29/19 13:44:12 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: adding new class for GlaDS

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/Loads/Channel.cpp (added)
• classes/Loads/Channel.h (added)
• classes/classes.h (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -117 +117 @@
                                         ./classes/Constraints/SpcStatic.cpp\
                                         ./classes/Constraints/SpcDynamic.cpp\
+                                        ./classes/Loads/Channel.cpp\
                                         ./classes/Loads/Loads.cpp\
                                         ./classes/Loads/Penpair.cpp\

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

@@ -35 +35 @@
 
 /*Loads: */
+#include "./Loads/Channel.h"
 #include "./Loads/Loads.h"
 #include "./Loads/Load.h"

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

@@ -928 +928 @@
         CfdragcoeffabsgradEnum,
         ClosedEnum,
+        ChannelEnum,
         ColinearEnum,
         ConstraintsEnum,

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

@@ -932 +932 @@
                 case CfdragcoeffabsgradEnum : return "Cfdragcoeffabsgrad";
                 case ClosedEnum : return "Closed";
+                case ChannelEnum : return "Channel";
                 case ColinearEnum : return "Colinear";
                 case ConstraintsEnum : return "Constraints";

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

@@ -953 +953 @@
               else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
               else if (strcmp(name,"Closed")==0) return ClosedEnum;
+              else if (strcmp(name,"Channel")==0) return ChannelEnum;
               else if (strcmp(name,"Colinear")==0) return ColinearEnum;
               else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
@@ -997 +998 @@
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
-              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"FemModel")==0) return FemModelEnum;
+              if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
+              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
               else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"MeshX")==0) return MeshXEnum;
               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
-              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"MINI")==0) return MINIEnum;
+              if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
+              else if (strcmp(name,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
               else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
-              else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
+              if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
+              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
               else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;