Changeset 15129
- Timestamp:
- 05/28/13 14:24:07 (12 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 2 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Element.h
r15128 r15129 101 101 virtual void MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units)=0; 102 102 virtual IssmDouble MassFlux(IssmDouble* segment,bool process_units)=0; 103 virtual void ElementResponse(IssmDouble* presponse,int response_enum ,bool process_units)=0;103 virtual void ElementResponse(IssmDouble* presponse,int response_enum)=0; 104 104 virtual IssmDouble IceVolume(void)=0; 105 105 virtual IssmDouble TotalSmb(void)=0; -
issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
r15128 r15129 3401 3401 /*}}}*/ 3402 3402 /*FUNCTION Penta::ElementResponse{{{*/ 3403 void Penta::ElementResponse(IssmDouble* presponse,int response_enum ,bool process_units){3403 void Penta::ElementResponse(IssmDouble* presponse,int response_enum){ 3404 3404 3405 3405 switch(response_enum){ -
issm/trunk-jpl/src/c/classes/Elements/Penta.h
r15128 r15129 136 136 void MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units); 137 137 void MaxVel(IssmDouble* pmaxvel, bool process_units); 138 void ElementResponse(IssmDouble* presponse,int response_enum ,bool process_units);138 void ElementResponse(IssmDouble* presponse,int response_enum); 139 139 void MaxVx(IssmDouble* pmaxvx, bool process_units); 140 140 void MaxVy(IssmDouble* pmaxvy, bool process_units); -
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r15128 r15129 3045 3045 /*}}}*/ 3046 3046 /*FUNCTION Tria::ElementResponse{{{*/ 3047 void Tria::ElementResponse(IssmDouble* presponse,int response_enum ,bool process_units){3047 void Tria::ElementResponse(IssmDouble* presponse,int response_enum){ 3048 3048 3049 3049 switch(response_enum){ -
issm/trunk-jpl/src/c/classes/Elements/Tria.h
r15128 r15129 133 133 void MaxAbsVy(IssmDouble* pmaxabsvy, bool process_units); 134 134 void MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units); 135 void ElementResponse(IssmDouble* presponse,int response_enum ,bool process_units);135 void ElementResponse(IssmDouble* presponse,int response_enum); 136 136 void MaxVel(IssmDouble* pmaxvel, bool process_units); 137 137 void MaxVx(IssmDouble* pmaxvx, bool process_units); -
issm/trunk-jpl/src/c/classes/FemModel.cpp
r15104 r15129 1368 1368 /*Ok, we found the element, compute responseocity: */ 1369 1369 if(my_rank==cpu_found){ 1370 element->ElementResponse(&response,response_enum ,IuToExtEnum);1370 element->ElementResponse(&response,response_enum); 1371 1371 } 1372 1372 -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r15082 r15129 408 408 ConstantEnum, 409 409 ConvergedEnum, 410 ExtToIuEnum,411 410 FillEnum, 412 411 FractionIncrementEnum, … … 414 413 GroundinglineMeltingRateEnum, 415 414 InternalEnum, 416 IuToExtEnum,417 415 MassFluxEnum, 418 416 MaxPenetrationEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r15082 r15129 402 402 case ConstantEnum : return "Constant"; 403 403 case ConvergedEnum : return "Converged"; 404 case ExtToIuEnum : return "ExtToIu";405 404 case FillEnum : return "Fill"; 406 405 case FractionIncrementEnum : return "FractionIncrement"; … … 408 407 case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate"; 409 408 case InternalEnum : return "Internal"; 410 case IuToExtEnum : return "IuToExt";411 409 case MassFluxEnum : return "MassFlux"; 412 410 case MaxPenetrationEnum : return "MaxPenetration"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r15082 r15129 411 411 else if (strcmp(name,"Constant")==0) return ConstantEnum; 412 412 else if (strcmp(name,"Converged")==0) return ConvergedEnum; 413 else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;414 413 else if (strcmp(name,"Fill")==0) return FillEnum; 415 414 else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; … … 417 416 else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; 418 417 else if (strcmp(name,"Internal")==0) return InternalEnum; 419 else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;420 418 else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; 421 419 else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; … … 506 504 else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; 507 505 else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; 506 else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; 507 else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; 508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; 512 else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; 513 else if (strcmp(name,"Step")==0) return StepEnum; 511 if (strcmp(name,"Step")==0) return StepEnum; 514 512 else if (strcmp(name,"Time")==0) return TimeEnum; 515 513 else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r15083 r15129 5399 5399 return StringToEnum('Converged')[0] 5400 5400 5401 def ExtToIuEnum():5402 """5403 EXTTOIUENUM - Enum of ExtToIu5404 5405 WARNING: DO NOT MODIFY THIS FILE5406 this file has been automatically generated by src/c/shared/Enum/Synchronize.sh5407 Please read src/c/shared/Enum/README for more information5408 5409 Usage:5410 macro=ExtToIuEnum()5411 """5412 5413 return StringToEnum('ExtToIu')[0]5414 5415 5401 def FillEnum(): 5416 5402 """ … … 5483 5469 return StringToEnum('Internal')[0] 5484 5470 5485 def IuToExtEnum():5486 """5487 IUTOEXTENUM - Enum of IuToExt5488 5489 WARNING: DO NOT MODIFY THIS FILE5490 this file has been automatically generated by src/c/shared/Enum/Synchronize.sh5491 Please read src/c/shared/Enum/README for more information5492 5493 Usage:5494 macro=IuToExtEnum()5495 """5496 5497 return StringToEnum('IuToExt')[0]5498 5499 5471 def MassFluxEnum(): 5500 5472 """ … … 7777 7749 """ 7778 7750 7779 return 55 47780 7751 return 552 7752 -
issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m
r15083 r15129 9 9 % macro=MaximumNumberOfEnums() 10 10 11 macro=55 4;11 macro=552;
Note:
See TracChangeset
for help on using the changeset viewer.