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

Timestamp:

11/01/16 11:48:51 (8 years ago)

Author:

adhikari

Message:

CHG: rotational feedback added (have to define perturbation terms for intertia tensor though)

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)

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

@@ -772 +772 @@
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
+              else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
+              else if (strcmp(name,"SealevelriseTidalLoveH")==0) return SealevelriseTidalLoveHEnum;
+              else if (strcmp(name,"SealevelriseTidalLoveK")==0) return SealevelriseTidalLoveKEnum;
+              else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
               else if (strcmp(name,"SealevelriseOceanAreaScaling")==0) return SealevelriseOceanAreaScalingEnum;
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
@@ -871 +875 @@
               else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
-              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
+         else stage=8;
+   }
+   if(stage==8){
+              if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
               else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
               else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
               else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
-         else stage=8;
-   }
-   if(stage==8){
-              if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
+              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;