Changeset 16235
- Timestamp:
- 09/23/13 11:28:24 (11 years ago)
- Location:
- issm/trunk-jpl/src/c/shared
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r16215 r16235 42 42 DependentObjectEnum, 43 43 StressbalanceAbstolEnum, 44 StressbalanceIcefrontEnum,45 44 StressbalanceIsnewtonEnum, 46 45 StressbalanceMaxiterEnum, … … 118 117 HydrologyEfficientEnum, 119 118 HydrologySedimentKmaxEnum, 120 BasisIntegralEnum,121 119 WaterTransferEnum, 122 120 IndependentObjectEnum, … … 138 136 InversionStepThresholdEnum, 139 137 InversionThicknessObsEnum, 140 InversionVelObsEnum,141 138 InversionVxObsEnum, 142 139 InversionVyObsEnum, … … 283 280 AdjointBalancethicknessAnalysisEnum, 284 281 AdjointHorizAnalysisEnum, 285 AdjointSolutionEnum,286 282 AnalysisCounterEnum, 287 283 NoneAnalysisEnum, … … 361 357 ControlInputEnum, 362 358 DatasetInputEnum, 363 DofIndexingEnum,364 359 DoubleInputEnum, 365 360 DataSetParamEnum, … … 372 367 ExternalResultEnum, 373 368 FileParamEnum, 374 HookEnum,375 IcefrontEnum,376 369 InputEnum, 377 370 IntInputEnum, … … 379 372 IntVecParamEnum, 380 373 TransientParamEnum, 381 IceFrontTypeEnum,382 SSA2dIceFrontEnum,383 SSA3dIceFrontEnum,384 374 MaticeEnum, 385 375 MatparEnum, … … 388 378 NumericalfluxTypeEnum, 389 379 ParamEnum, 390 L1L2IceFrontEnum,391 HOIceFrontEnum,392 380 PengridEnum, 393 381 PenpairEnum, … … 405 393 SpcStaticEnum, 406 394 SpcTransientEnum, 407 FSIceFrontEnum,408 395 StringArrayParamEnum, 409 396 StringParamEnum, … … 434 421 BedSlopeYEnum, 435 422 BoundaryEnum, 436 ConstantEnum,437 423 ConvergedEnum, 438 424 FillEnum, … … 442 428 InternalEnum, 443 429 MassFluxEnum, 444 MaxPenetrationEnum,445 430 MeltingOffsetEnum, 446 431 MisfitEnum, 447 NumberNodeToElementConnectivityEnum,448 432 PressureEnum, 449 433 PressurePicardEnum, … … 471 455 SurfaceSlopeYEnum, 472 456 TemperatureEnum, 473 TemperatureOldEnum,474 457 TemperaturePicardEnum, 475 458 ThicknessAbsMisfitEnum, … … 634 617 GenericOptionEnum, 635 618 OptionCellEnum, 636 OptionCharEnum,637 619 OptionStructEnum, 638 OptionDoubleEnum,639 OptionLogicalEnum,640 620 /*}}}*/ 641 621 /*Rheology law (move too Material) {{{*/ -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r16215 r16235 50 50 case DependentObjectEnum : return "DependentObject"; 51 51 case StressbalanceAbstolEnum : return "StressbalanceAbstol"; 52 case StressbalanceIcefrontEnum : return "StressbalanceIcefront";53 52 case StressbalanceIsnewtonEnum : return "StressbalanceIsnewton"; 54 53 case StressbalanceMaxiterEnum : return "StressbalanceMaxiter"; … … 126 125 case HydrologyEfficientEnum : return "HydrologyEfficient"; 127 126 case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; 128 case BasisIntegralEnum : return "BasisIntegral";129 127 case WaterTransferEnum : return "WaterTransfer"; 130 128 case IndependentObjectEnum : return "IndependentObject"; … … 146 144 case InversionStepThresholdEnum : return "InversionStepThreshold"; 147 145 case InversionThicknessObsEnum : return "InversionThicknessObs"; 148 case InversionVelObsEnum : return "InversionVelObs";149 146 case InversionVxObsEnum : return "InversionVxObs"; 150 147 case InversionVyObsEnum : return "InversionVyObs"; … … 289 286 case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis"; 290 287 case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis"; 291 case AdjointSolutionEnum : return "AdjointSolution";292 288 case AnalysisCounterEnum : return "AnalysisCounter"; 293 289 case NoneAnalysisEnum : return "NoneAnalysis"; … … 361 357 case ControlInputEnum : return "ControlInput"; 362 358 case DatasetInputEnum : return "DatasetInput"; 363 case DofIndexingEnum : return "DofIndexing";364 359 case DoubleInputEnum : return "DoubleInput"; 365 360 case DataSetParamEnum : return "DataSetParam"; … … 372 367 case ExternalResultEnum : return "ExternalResult"; 373 368 case FileParamEnum : return "FileParam"; 374 case HookEnum : return "Hook";375 case IcefrontEnum : return "Icefront";376 369 case InputEnum : return "Input"; 377 370 case IntInputEnum : return "IntInput"; … … 379 372 case IntVecParamEnum : return "IntVecParam"; 380 373 case TransientParamEnum : return "TransientParam"; 381 case IceFrontTypeEnum : return "IceFrontType";382 case SSA2dIceFrontEnum : return "SSA2dIceFront";383 case SSA3dIceFrontEnum : return "SSA3dIceFront";384 374 case MaticeEnum : return "Matice"; 385 375 case MatparEnum : return "Matpar"; … … 388 378 case NumericalfluxTypeEnum : return "NumericalfluxType"; 389 379 case ParamEnum : return "Param"; 390 case L1L2IceFrontEnum : return "L1L2IceFront";391 case HOIceFrontEnum : return "HOIceFront";392 380 case PengridEnum : return "Pengrid"; 393 381 case PenpairEnum : return "Penpair"; … … 405 393 case SpcStaticEnum : return "SpcStatic"; 406 394 case SpcTransientEnum : return "SpcTransient"; 407 case FSIceFrontEnum : return "FSIceFront";408 395 case StringArrayParamEnum : return "StringArrayParam"; 409 396 case StringParamEnum : return "StringParam"; … … 428 415 case BedSlopeYEnum : return "BedSlopeY"; 429 416 case BoundaryEnum : return "Boundary"; 430 case ConstantEnum : return "Constant";431 417 case ConvergedEnum : return "Converged"; 432 418 case FillEnum : return "Fill"; … … 436 422 case InternalEnum : return "Internal"; 437 423 case MassFluxEnum : return "MassFlux"; 438 case MaxPenetrationEnum : return "MaxPenetration";439 424 case MeltingOffsetEnum : return "MeltingOffset"; 440 425 case MisfitEnum : return "Misfit"; 441 case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity";442 426 case PressureEnum : return "Pressure"; 443 427 case PressurePicardEnum : return "PressurePicard"; … … 465 449 case SurfaceSlopeYEnum : return "SurfaceSlopeY"; 466 450 case TemperatureEnum : return "Temperature"; 467 case TemperatureOldEnum : return "TemperatureOld";468 451 case TemperaturePicardEnum : return "TemperaturePicard"; 469 452 case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; … … 606 589 case GenericOptionEnum : return "GenericOption"; 607 590 case OptionCellEnum : return "OptionCell"; 608 case OptionCharEnum : return "OptionChar";609 591 case OptionStructEnum : return "OptionStruct"; 610 case OptionDoubleEnum : return "OptionDouble";611 case OptionLogicalEnum : return "OptionLogical";612 592 case PatersonEnum : return "Paterson"; 613 593 case ArrheniusEnum : return "Arrhenius"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r16215 r16235 50 50 else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum; 51 51 else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum; 52 else if (strcmp(name,"StressbalanceIcefront")==0) return StressbalanceIcefrontEnum;53 52 else if (strcmp(name,"StressbalanceIsnewton")==0) return StressbalanceIsnewtonEnum; 54 53 else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum; … … 126 125 else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum; 127 126 else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; 128 else if (strcmp(name,"BasisIntegral")==0) return BasisIntegralEnum;129 127 else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum; 130 128 else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; … … 137 135 else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; 138 136 else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; 137 else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; 138 else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; 139 139 else stage=2; 140 140 } 141 141 if(stage==2){ 142 if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; 143 else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; 144 else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; 142 if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; 145 143 else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; 146 144 else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; … … 149 147 else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; 150 148 else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; 151 else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;152 149 else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; 153 150 else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; … … 260 257 else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; 261 258 else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; 259 else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; 260 else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; 261 else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; 262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; 266 else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; 267 else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; 268 else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; 265 if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; 269 266 else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; 270 267 else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; … … 295 292 else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; 296 293 else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; 297 else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;298 294 else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; 299 295 else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; … … 367 363 else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; 368 364 else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; 369 else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;370 365 else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; 371 366 else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum; … … 378 373 else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; 379 374 else if (strcmp(name,"FileParam")==0) return FileParamEnum; 380 else if (strcmp(name,"Hook")==0) return HookEnum;381 else if (strcmp(name,"Icefront")==0) return IcefrontEnum;382 375 else if (strcmp(name,"Input")==0) return InputEnum; 383 376 else if (strcmp(name,"IntInput")==0) return IntInputEnum; 384 377 else if (strcmp(name,"IntParam")==0) return IntParamEnum; 385 else stage=4; 386 } 387 if(stage==4){ 388 if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; 378 else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; 389 379 else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; 390 else if (strcmp(name,"IceFrontType")==0) return IceFrontTypeEnum;391 else if (strcmp(name,"SSA2dIceFront")==0) return SSA2dIceFrontEnum;392 else if (strcmp(name,"SSA3dIceFront")==0) return SSA3dIceFrontEnum;393 380 else if (strcmp(name,"Matice")==0) return MaticeEnum; 394 381 else if (strcmp(name,"Matpar")==0) return MatparEnum; … … 396 383 else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; 397 384 else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; 398 else if (strcmp(name,"Param")==0) return ParamEnum; 399 else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum; 400 else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum; 385 else stage=4; 386 } 387 if(stage==4){ 388 if (strcmp(name,"Param")==0) return ParamEnum; 401 389 else if (strcmp(name,"Pengrid")==0) return PengridEnum; 402 390 else if (strcmp(name,"Penpair")==0) return PenpairEnum; … … 414 402 else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; 415 403 else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; 416 else if (strcmp(name,"FSIceFront")==0) return FSIceFrontEnum;417 404 else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; 418 405 else if (strcmp(name,"StringParam")==0) return StringParamEnum; … … 437 424 else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; 438 425 else if (strcmp(name,"Boundary")==0) return BoundaryEnum; 439 else if (strcmp(name,"Constant")==0) return ConstantEnum;440 426 else if (strcmp(name,"Converged")==0) return ConvergedEnum; 441 427 else if (strcmp(name,"Fill")==0) return FillEnum; … … 445 431 else if (strcmp(name,"Internal")==0) return InternalEnum; 446 432 else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; 447 else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;448 433 else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; 449 434 else if (strcmp(name,"Misfit")==0) return MisfitEnum; 450 else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;451 435 else if (strcmp(name,"Pressure")==0) return PressureEnum; 452 436 else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; … … 474 458 else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; 475 459 else if (strcmp(name,"Temperature")==0) return TemperatureEnum; 476 else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;477 460 else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; 478 461 else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; … … 506 489 else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; 507 490 else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; 508 else stage=5; 509 } 510 if(stage==5){ 511 if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; 491 else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; 512 492 else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; 513 493 else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; … … 526 506 else if (strcmp(name,"P1")==0) return P1Enum; 527 507 else if (strcmp(name,"P1DG")==0) return P1DGEnum; 528 else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; 508 else stage=5; 509 } 510 if(stage==5){ 511 if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; 529 512 else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; 530 513 else if (strcmp(name,"P2")==0) return P2Enum; … … 618 601 else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; 619 602 else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; 620 else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;621 603 else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; 622 else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;623 else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;624 604 else if (strcmp(name,"Paterson")==0) return PatersonEnum; 625 605 else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; -
issm/trunk-jpl/src/c/shared/Exp/exp.h
r15218 r16235 92 92 //# Points Count Value 93 93 if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname); 94 if(fscanf(fid,"%20 u%255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);94 if(fscanf(fid,"%20i %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname); 95 95 //# X pos Y pos 96 96 if(fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy)!=5) _error_("Could not read " << domainname); … … 130 130 131 131 /*Get number of profile vertices: */ 132 if(fscanf(fid,"%20 u%255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);132 if(fscanf(fid,"%20i %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname); 133 133 134 134 /*Skip next line: */
Note:
See TracChangeset
for help on using the changeset viewer.