Ignore:
Timestamp:
07/20/20 20:55:46 (5 years ago)
Author:
Eric.Larour
Message:

CHG: new SealevelArea output from the geometry module + better output information
for error in GetInput2Value.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r25252 r25293  
    840840              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    841841              else if (strcmp(name,"Area")==0) return AreaEnum;
     842              else if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
    842843              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    843844              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    … …  
    874875              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    875876              else if (strcmp(name,"Vz")==0) return VzEnum;
    876               else if (strcmp(name,"VzFS")==0) return VzFSEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"VzHO")==0) return VzHOEnum;
     880              if (strcmp(name,"VzFS")==0) return VzFSEnum;
     881              else if (strcmp(name,"VzHO")==0) return VzHOEnum;
    881882              else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
    882883              else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
    … …  
    997998              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    998999              else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
    999               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
     1003              if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
     1004              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    10041005              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    10051006              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    … …  
    11201121              else if (strcmp(name,"Gsl")==0) return GslEnum;
    11211122              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    1122               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Hook")==0) return HookEnum;
     1126              if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
     1127              else if (strcmp(name,"Hook")==0) return HookEnum;
    11271128              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
    11281129              else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
    … …  
    12431244              else if (strcmp(name,"P0DG")==0) return P0DGEnum;
    12441245              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    1245               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     1249              if (strcmp(name,"P1P1")==0) return P1P1Enum;
     1250              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    12501251              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
    12511252              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    … …  
    13661367              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    13671368              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
    1368               else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
     1372              if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
     1373              else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
    13731374              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
    13741375              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
Note: See TracChangeset for help on using the changeset viewer.