Changeset 25358

Timestamp:

08/08/20 11:50:19 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum

Files:

• Enum.vim (modified) (1 diff)
• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (2 diffs)

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/Enum.vim

@@ -1288 +1288 @@
 syn keyword cConstant SpcTransientEnum
 syn keyword cConstant SsetEnum
+syn keyword cConstant StatisticsSolutionEnum
 syn keyword cConstant SteadystateSolutionEnum
 syn keyword cConstant StressIntensityFactorEnum

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/EnumDefinitions.h

@@ -1287 +1287 @@
         SpcTransientEnum,
         SsetEnum,
+        StatisticsSolutionEnum,
         SteadystateSolutionEnum,
         StressIntensityFactorEnum,

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/EnumToStringx.cpp

@@ -1290 +1290 @@
                 case SpcTransientEnum : return "SpcTransient";
                 case SsetEnum : return "Sset";
+                case StatisticsSolutionEnum : return "StatisticsSolution";
                 case SteadystateSolutionEnum : return "SteadystateSolution";
                 case StressIntensityFactorEnum : return "StressIntensityFactor";

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/StringToEnumx.cpp

@@ -1320 +1320 @@
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
               else if (strcmp(name,"Sset")==0) return SsetEnum;
+              else if (strcmp(name,"StatisticsSolution")==0) return StatisticsSolutionEnum;
               else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
               else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum;
@@ -1366 +1367 @@
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
               else if (strcmp(name,"Water")==0) return WaterEnum;
-              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"XY")==0) return XYEnum;
+              if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
+              else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZ")==0) return XYZEnum;
               else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;