Ignore:
Timestamp:
11/05/14 15:40:11 (11 years ago)
Author:
srebuffi
Message:

CHG: added CalvingRate computation

Location:
issm/trunk-jpl/src/c/shared/Enum
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r18732 r18736  
    208208        NewDamageEnum,
    209209        StressIntensityFactorEnum,
     210        CalvingratexEnum,
     211        CalvingrateyEnum,
     212        CalvingratexAverageEnum,
     213        CalvingrateyAverageEnum,
    210214        StrainRateparallelEnum,
    211215        StrainRateperpendicularEnum,
    … …  
    245249        MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
    246250        MasstransportHydrostaticAdjustmentEnum,
     251        MasstransportIscalvingrateEnum,
     252        MasstransportLevermannCalvingCoeffEnum,
    247253        MasstransportIsfreesurfaceEnum,
    248254        MasstransportMinThicknessEnum,

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

    r18732 r18736  
    216216                case NewDamageEnum : return "NewDamage";
    217217                case StressIntensityFactorEnum : return "StressIntensityFactor";
     218                case CalvingratexEnum : return "Calvingratex";
     219                case CalvingrateyEnum : return "Calvingratey";
     220                case CalvingratexAverageEnum : return "CalvingratexAverage";
     221                case CalvingrateyAverageEnum : return "CalvingrateyAverage";
    218222                case StrainRateparallelEnum : return "StrainRateparallel";
    219223                case StrainRateperpendicularEnum : return "StrainRateperpendicular";
    … …  
    253257                case MiscellaneousNameEnum : return "MiscellaneousName";
    254258                case MasstransportHydrostaticAdjustmentEnum : return "MasstransportHydrostaticAdjustment";
     259                case MasstransportIscalvingrateEnum : return "MasstransportIscalvingrate";
     260                case MasstransportLevermannCalvingCoeffEnum : return "MasstransportLevermannCalvingCoeff";
    255261                case MasstransportIsfreesurfaceEnum : return "MasstransportIsfreesurface";
    256262                case MasstransportMinThicknessEnum : return "MasstransportMinThickness";

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

    r18732 r18736  
    219219              else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
    220220              else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum;
     221              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
     222              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
     223              else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
     224              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    221225              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    222226              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
    … …  
    256260              else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    257261              else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
     266              else if (strcmp(name,"MasstransportLevermannCalvingCoeff")==0) return MasstransportLevermannCalvingCoeffEnum;
    258267              else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
    259268              else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
    260269              else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
    261270              else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"MasstransportCalvingrate")==0) return MasstransportCalvingrateEnum;
     271              else if (strcmp(name,"MasstransportCalvingrate")==0) return MasstransportCalvingrateEnum;
    266272              else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    267273              else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
    … …  
    377383              else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    378384              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    379               else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
    380389              else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
    381390              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    … …  
    383392              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    384393              else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
     394              else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
    389395              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    390396              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    … …  
    500506              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
    501507              else if (strcmp(name,"Tetra")==0) return TetraEnum;
    502               else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    503512              else if (strcmp(name,"Penta")==0) return PentaEnum;
    504513              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
    … …  
    506515              else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
    507516              else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"Air")==0) return AirEnum;
     517              else if (strcmp(name,"Air")==0) return AirEnum;
    512518              else if (strcmp(name,"Ice")==0) return IceEnum;
    513519              else if (strcmp(name,"Melange")==0) return MelangeEnum;
    … …  
    623629              else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
    624630              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    625               else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    626635              else if (strcmp(name,"MINI")==0) return MINIEnum;
    627636              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    … …  
    629638              else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;
    630639              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
     640              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
    635641              else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
    636642              else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
    … …  
    746752              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    747753              else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
    748               else if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
    749758              else if (strcmp(name,"Seaiceocean")==0) return SeaiceoceanEnum;
    750759              else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum;
    … …  
    752761              else if (strcmp(name,"SeaiceMinConcentration")==0) return SeaiceMinConcentrationEnum;
    753762              else if (strcmp(name,"SeaiceMinThickness")==0) return SeaiceMinThicknessEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"SeaiceMaxThickness")==0) return SeaiceMaxThicknessEnum;
     763              else if (strcmp(name,"SeaiceMaxThickness")==0) return SeaiceMaxThicknessEnum;
    758764              else if (strcmp(name,"SeaiceSpcvx")==0) return SeaiceSpcvxEnum;
    759765              else if (strcmp(name,"SeaiceSpcvy")==0) return SeaiceSpcvyEnum;
Note: See TracChangeset for help on using the changeset viewer.