Ignore:
Timestamp:
06/01/15 05:37:07 (10 years ago)
Author:
cborstad
Message:

CHG: updating damage calculation as the result of a stress balance solution; getting rid of unused penalty variables; adding kappa variable to damage class

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r19373 r19381  
    213213              else if (strcmp(name,"DamageHealing")==0) return DamageHealingEnum;
    214214              else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
     215              else if (strcmp(name,"DamageKappa")==0) return DamageKappaEnum;
    215216              else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
    216               else if (strcmp(name,"DamagePenaltyThreshold")==0) return DamagePenaltyThresholdEnum;
    217               else if (strcmp(name,"DamagePenaltyLock")==0) return DamagePenaltyLockEnum;
    218               else if (strcmp(name,"DamagePenaltyFactor")==0) return DamagePenaltyFactorEnum;
    219217              else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
    220218              else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
    … …  
    260258              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    261259              else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
     260              else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
     261              else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
    266               else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
    267               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
     265              if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
    268266              else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
    269267              else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
    … …  
    383381              else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
    384382              else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
     383              else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
     384              else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
    389               else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
    390               else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
     388              if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
    391389              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
    392390              else if (strcmp(name,"SurfaceforcingsAccumulation")==0) return SurfaceforcingsAccumulationEnum;
    … …  
    506504              else if (strcmp(name,"Matice")==0) return MaticeEnum;
    507505              else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
     506              else if (strcmp(name,"Matpar")==0) return MatparEnum;
     507              else if (strcmp(name,"Node")==0) return NodeEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"Matpar")==0) return MatparEnum;
    512               else if (strcmp(name,"Node")==0) return NodeEnum;
    513               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
     511              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    514512              else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
    515513              else if (strcmp(name,"Param")==0) return ParamEnum;
    … …  
    629627              else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
    630628              else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
     629              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
     630              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    635               else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    636               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
     634              if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    637635              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    638636              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    … …  
    752750              else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    753751              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
     752              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
     753              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    758               else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    759               else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
     757              if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
    760758              else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
    761759              else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
    … …  
    875873              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    876874              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
     875              else if (strcmp(name,"Regular")==0) return RegularEnum;
     876              else if (strcmp(name,"Scaled")==0) return ScaledEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Regular")==0) return RegularEnum;
    881               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
    882               else if (strcmp(name,"Separate")==0) return SeparateEnum;
     880              if (strcmp(name,"Separate")==0) return SeparateEnum;
    883881              else if (strcmp(name,"Sset")==0) return SsetEnum;
    884882              else if (strcmp(name,"Verbose")==0) return VerboseEnum;
Note: See TracChangeset for help on using the changeset viewer.