Changeset 22607

Timestamp:

03/22/18 11:46:52 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: more enum stuff

Location:

issm/trunk-jpl/src/c

Files:

• analyses/DamageEvolutionAnalysis.cpp (modified) (1 diff)
• analyses/SmbAnalysis.cpp (modified) (2 diffs)
• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• shared/Enum/StringToEnumx.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -78 +78 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.damage.law",DamageLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.damage.stabilization",DamageStabilizationEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.damage.maxiter",DamageMaxiterEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.damage.max_damage",DamageMaxDamageEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.damage.elementinterp",DamageElementinterpEnum));
 
         /*Requested outputs*/

issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp

@@ -185 +185 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.ismungsm",SmbIsmungsmEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum));
                         iomodel->FindConstant(&isdelta18o,"md.smb.isdelta18o");
                         iomodel->FindConstant(&ismungsm,"md.smb.ismungsm");
@@ -217 +215 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.isd18opd",SmbIsd18opdEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum));
                         iomodel->FindConstant(&ismungsm,"md.smb.ismungsm");
                         iomodel->FindConstant(&isd18opd,"md.smb.isd18opd");

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -128 +128 @@
                         case 1:/*TAO*/
                                 parameters->AddObject(iomodel->CopyConstantObject("md.inversion.incomplete_adjoint",InversionIncompleteAdjointEnum));
-                                parameters->AddObject(iomodel->CopyConstantObject("md.inversion.fatol",InversionFatolEnum));
-                                parameters->AddObject(iomodel->CopyConstantObject("md.inversion.frtol",InversionFrtolEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject("md.inversion.gatol",InversionGatolEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject("md.inversion.grtol",InversionGrtolEnum));

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

@@ -650 +650 @@
         CuffeyTemperateEnum,
         DamageC4Enum,
-        DamageElementinterpEnum,
         DamageEvolutionAnalysisEnum,
         DamageEvolutionSolutionEnum,
-        DamageMaxiterEnum,
         DataSetEnum,
         DatasetInputEnum,
@@ -771 +769 @@
         IntParamEnum,
         IntVecParamEnum,
-        InversionFatolEnum,
-        InversionFrtolEnum,
         InversionVzObsEnum,
         JEnum,

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

@@ -654 +654 @@
                 case CuffeyTemperateEnum : return "CuffeyTemperate";
                 case DamageC4Enum : return "DamageC4";
-                case DamageElementinterpEnum : return "DamageElementinterp";
                 case DamageEvolutionAnalysisEnum : return "DamageEvolutionAnalysis";
                 case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution";
-                case DamageMaxiterEnum : return "DamageMaxiter";
                 case DataSetEnum : return "DataSet";
                 case DatasetInputEnum : return "DatasetInput";
@@ -775 +773 @@
                 case IntParamEnum : return "IntParam";
                 case IntVecParamEnum : return "IntVecParam";
-                case InversionFatolEnum : return "InversionFatol";
-                case InversionFrtolEnum : return "InversionFrtol";
                 case InversionVzObsEnum : return "InversionVzObs";
                 case JEnum : return "J";

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

@@ -669 +669 @@
               else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
               else if (strcmp(name,"DamageC4")==0) return DamageC4Enum;
-              else if (strcmp(name,"DamageElementinterp")==0) return DamageElementinterpEnum;
               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
               else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
-              else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
               else if (strcmp(name,"DataSet")==0) return DataSetEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
@@ -752 +750 @@
               else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+              else if (strcmp(name,"Hook")==0) return HookEnum;
+              else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Hook")==0) return HookEnum;
-              else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
-              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
+              if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
               else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
               else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
@@ -793 +791 @@
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-              else if (strcmp(name,"InversionFatol")==0) return InversionFatolEnum;
-              else if (strcmp(name,"InversionFrtol")==0) return InversionFrtolEnum;
               else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
               else if (strcmp(name,"J")==0) return JEnum;
@@ -875 +871 @@
               else if (strcmp(name,"MinVz")==0) return MinVzEnum;
               else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
+              else if (strcmp(name,"Moulin")==0) return MoulinEnum;
+              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
+              else if (strcmp(name,"Mpi")==0) return MpiEnum;
+              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Moulin")==0) return MoulinEnum;
-              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
-              else if (strcmp(name,"Mpi")==0) return MpiEnum;
-              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
-              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
+              if (strcmp(name,"Mumps")==0) return MumpsEnum;
               else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
               else if (strcmp(name,"Nodal")==0) return NodalEnum;
@@ -998 +994 @@
               else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
               else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
+              else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
+              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
+              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
+              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
-              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
-              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
-              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
-              else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
+              if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
               else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
               else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
@@ -1121 +1117 @@
               else if (strcmp(name,"Outputdefinition87")==0) return Outputdefinition87Enum;
               else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum;
+              else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum;
+              else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
+              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
+              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum;
-              else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
-              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
-              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
-              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
+              if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
               else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
               else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;