source: issm/oecreview/Archive/18296-19100/ISSM-18746-18747.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 7.3 KB

  • ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

     
    663663        Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
    664664        active_element_input->GetInputValue(&active_element);
    665665
    666         basalelement->parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum);
     666        basalelement->parameters->FindParam(&penalty_lock,HydrologydcEplflipLockEnum);
    667667
    668668        basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum);
    669669        basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessEnum);   

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

     
    136136        HydrologydcLeakageFactorEnum,
    137137        HydrologydcPenaltyFactorEnum,
    138138        HydrologydcPenaltyLockEnum,
     139        HydrologydcEplflipLockEnum,
    139140        HydrologydcBasalMoulinInputEnum,
    140141        HydrologyLayerEnum,
    141142        HydrologySedimentEnum,

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

     
    144144                case HydrologydcLeakageFactorEnum : return "HydrologydcLeakageFactor";
    145145                case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor";
    146146                case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock";
     147                case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
    147148                case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
    148149                case HydrologyLayerEnum : return "HydrologyLayer";
    149150                case HydrologySedimentEnum : return "HydrologySediment";

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

     
    147147              else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
    148148              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    149149              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
     150              else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
    150151              else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
    151152              else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
    152153              else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
    … …  
    258259              else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
    259260              else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
    260261              else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    261               else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
     265              if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
     266              else if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
    266267              else if (strcmp(name,"MasstransportLevermannCalvingCoeff")==0) return MasstransportLevermannCalvingCoeffEnum;
    267268              else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
    268269              else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
    … …  
    381382              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    382383              else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
    383384              else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    384               else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
     388              if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
     389              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
    389390              else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
    390391              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    391392              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    … …  
    504505              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
    505506              else if (strcmp(name,"Tria")==0) return TriaEnum;
    506507              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
    507               else if (strcmp(name,"Tetra")==0) return TetraEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
     511              if (strcmp(name,"Tetra")==0) return TetraEnum;
     512              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    512513              else if (strcmp(name,"Penta")==0) return PentaEnum;
    513514              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
    514515              else if (strcmp(name,"Vertex")==0) return VertexEnum;
    … …  
    627628              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    628629              else if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
    629630              else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
    630               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     634              if (strcmp(name,"P1P1")==0) return P1P1Enum;
     635              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    635636              else if (strcmp(name,"MINI")==0) return MINIEnum;
    636637              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    637638              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
    … …  
    750751              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
    751752              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    752753              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    753               else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
     757              if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
     758              else if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
    758759              else if (strcmp(name,"Seaiceocean")==0) return SeaiceoceanEnum;
    759760              else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum;
    760761              else if (strcmp(name,"SeaiceConcentration")==0) return SeaiceConcentrationEnum;
Note: See TracBrowser for help on using the repository browser.