Changeset 16510

Timestamp:

10/22/13 10:26:45 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed NoneAnalalysis, not used anymore

Location:

issm/trunk-jpl/src

Files:

• c/classes/Params/Parameters.cpp (modified) (1 diff)
• c/modules/GroundinglineMigrationx/GroundinglineMigrationx.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) (3 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/NoneAnalysisEnum.m (deleted)

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -524 +524 @@
         }
         if(found==-1){
-                /*still haven't found a list of petsc options, go find the default one, for analysis type NoneAnalysisEnum: */
+                /*still haven't found a list of petsc options, go find the default one, for analysis type DefaultAnalysisEnum: */
                 for(i=0;i<numanalyses;i++){
                         if(analyses[i]==DefaultAnalysisEnum){

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

@@ -30 +30 @@
 
         /*Set toolkit to default*/
-        ToolkitsOptionsFromAnalysis(parameters,NoneAnalysisEnum);
+        ToolkitsOptionsFromAnalysis(parameters,DefaultAnalysisEnum);
 
         if(migration_style==SoftMigrationEnum){

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

@@ -290 +290 @@
         AdjointHorizAnalysisEnum,
         AnalysisCounterEnum,
-        NoneAnalysisEnum,
         DefaultAnalysisEnum,
         BalancethicknessAnalysisEnum,

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

@@ -296 +296 @@
                 case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis";
                 case AnalysisCounterEnum : return "AnalysisCounter";
-                case NoneAnalysisEnum : return "NoneAnalysis";
                 case DefaultAnalysisEnum : return "DefaultAnalysis";
                 case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";

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

@@ -302 +302 @@
               else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
               else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
-              else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
               else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
               else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
@@ -383 +382 @@
               else if (strcmp(name,"Element")==0) return ElementEnum;
               else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
+              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"FileParam")==0) return FileParamEnum;
-              else if (strcmp(name,"Input")==0) return InputEnum;
+              if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
               else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum;
@@ -506 +505 @@
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
+              else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
-              else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
+              if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
               else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
               else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;

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

@@ -288 +288 @@
 def AdjointHorizAnalysisEnum(): return StringToEnum("AdjointHorizAnalysis")[0]
 def AnalysisCounterEnum(): return StringToEnum("AnalysisCounter")[0]
-def NoneAnalysisEnum(): return StringToEnum("NoneAnalysis")[0]
 def DefaultAnalysisEnum(): return StringToEnum("DefaultAnalysis")[0]
 def BalancethicknessAnalysisEnum(): return StringToEnum("BalancethicknessAnalysis")[0]