Changeset 22611

Timestamp:

03/22/18 15:15:54 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: more enum stuff

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (2 diffs)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -59 +59 @@
                 iomodel->FindConstant(&variabledescriptors,&numvariabledescriptors,"md.qmu.variabledescriptors");
 
-                /*Ok, we have all the variable descriptors. Build a parameter with it: */
-                parameters->AddObject(new StringArrayParam(QmuVariabledescriptorsEnum,variabledescriptors,numvariabledescriptors));
-
                 /*Fetch response descriptors*/
                 iomodel->FindConstant(&responsedescriptors,&numresponsedescriptors,"md.qmu.responsedescriptors");
@@ -67 +64 @@
                 /*Ok, we have all the response descriptors. Build a parameter with it: */
                 parameters->AddObject(new StringArrayParam(QmuResponsedescriptorsEnum,responsedescriptors,numresponsedescriptors));
-                parameters->AddObject(new    IntParam(QmuNumberofresponsesEnum,numberofresponses));
 
                 /*Deal with partitioning*/

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

@@ -888 +888 @@
         ProfilingCurrentMemEnum,
         ProfilingSolutionTimeEnum,
-        QmuNumberofresponsesEnum,
-        QmuVariabledescriptorsEnum,
         RegionaloutputEnum,
         RegularEnum,

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

@@ -892 +892 @@
                 case ProfilingCurrentMemEnum : return "ProfilingCurrentMem";
                 case ProfilingSolutionTimeEnum : return "ProfilingSolutionTime";
-                case QmuNumberofresponsesEnum : return "QmuNumberofresponses";
-                case QmuVariabledescriptorsEnum : return "QmuVariabledescriptors";
                 case RegionaloutputEnum : return "Regionaloutput";
                 case RegularEnum : return "Regular";

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

@@ -913 +913 @@
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
               else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
-              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
-              else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
               else if (strcmp(name,"Regionaloutput")==0) return RegionaloutputEnum;
               else if (strcmp(name,"Regular")==0) return RegularEnum;
@@ -998 +996 @@
               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 if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
-              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
-              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
+              if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"Tria")==0) return TriaEnum;
@@ -1121 +1119 @@
               else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
               else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
+              else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
+              else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
-              else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
-              else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
+              if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
               else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
               else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;