Changeset 5468
- Timestamp:
- 08/21/10 22:37:59 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 17 added
- 71 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r5358 r5468 279 279 OutputFrequencyEnum, 280 280 /*}}}*/ 281 /*Responses{{{1*/ 282 MinVelEnum, 283 MaxVelEnum, 284 MinVxEnum, 285 MaxVxEnum, 286 MaxAbsVxEnum, 287 MinVyEnum, 288 MaxVyEnum, 289 MaxAbsVyEnum, 290 MinVzEnum, 291 MaxVzEnum, 292 MaxAbsVzEnum, 293 /*}}}*/ 281 294 /*Convergence{{{1*/ 282 295 RelativeEnum, … … 342 355 QmuOutNameEnum, 343 356 QmuPartEnum, 357 QmuNumberOfResponsesEnum, 358 IndexedEnum, 359 RegularEnum, 360 IndexEnum, 361 ScaledEnum, 362 NodalEnum, 344 363 ResponseDescriptorsEnum, 345 364 SolverStringEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r5358 r5468 248 248 case TimeEnum : return "Time"; 249 249 case OutputFrequencyEnum : return "OutputFrequency"; 250 case MinVelEnum : return "MinVel"; 251 case MaxVelEnum : return "MaxVel"; 252 case MinVxEnum : return "MinVx"; 253 case MaxVxEnum : return "MaxVx"; 254 case MaxAbsVxEnum : return "MaxAbsVx"; 255 case MinVyEnum : return "MinVy"; 256 case MaxVyEnum : return "MaxVy"; 257 case MaxAbsVyEnum : return "MaxAbsVy"; 258 case MinVzEnum : return "MinVz"; 259 case MaxVzEnum : return "MaxVz"; 260 case MaxAbsVzEnum : return "MaxAbsVz"; 250 261 case RelativeEnum : return "Relative"; 251 262 case ResidualEnum : return "Residual"; … … 306 317 case QmuOutNameEnum : return "QmuOutName"; 307 318 case QmuPartEnum : return "QmuPart"; 319 case QmuNumberOfResponsesEnum : return "QmuNumberOfResponses"; 320 case IndexedEnum : return "Indexed"; 321 case RegularEnum : return "Regular"; 322 case IndexEnum : return "Index"; 323 case ScaledEnum : return "Scaled"; 324 case NodalEnum : return "Nodal"; 308 325 case ResponseDescriptorsEnum : return "ResponseDescriptors"; 309 326 case SolverStringEnum : return "SolverString"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r5358 r5468 246 246 else if (strcmp(name,"Time")==0) return TimeEnum; 247 247 else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum; 248 else if (strcmp(name,"MinVel")==0) return MinVelEnum; 249 else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; 250 else if (strcmp(name,"MinVx")==0) return MinVxEnum; 251 else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; 252 else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; 253 else if (strcmp(name,"MinVy")==0) return MinVyEnum; 254 else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; 255 else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; 256 else if (strcmp(name,"MinVz")==0) return MinVzEnum; 257 else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; 258 else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; 248 259 else if (strcmp(name,"Relative")==0) return RelativeEnum; 249 260 else if (strcmp(name,"Residual")==0) return ResidualEnum; … … 304 315 else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; 305 316 else if (strcmp(name,"QmuPart")==0) return QmuPartEnum; 317 else if (strcmp(name,"QmuNumberOfResponses")==0) return QmuNumberOfResponsesEnum; 318 else if (strcmp(name,"Indexed")==0) return IndexedEnum; 319 else if (strcmp(name,"Regular")==0) return RegularEnum; 320 else if (strcmp(name,"Index")==0) return IndexEnum; 321 else if (strcmp(name,"Scaled")==0) return ScaledEnum; 322 else if (strcmp(name,"Nodal")==0) return NodalEnum; 306 323 else if (strcmp(name,"ResponseDescriptors")==0) return ResponseDescriptorsEnum; 307 324 else if (strcmp(name,"SolverString")==0) return SolverStringEnum; -
issm/trunk/src/m/enum/AbsoluteEnum.m
r5287 r5468 9 9 % macro=AbsoluteEnum() 10 10 11 macro=2 34;11 macro=245; -
issm/trunk/src/m/enum/AdjointEnum.m
r5287 r5468 9 9 % macro=AdjointEnum() 10 10 11 macro=2 49;11 macro=260; -
issm/trunk/src/m/enum/BetaEnum.m
r5287 r5468 9 9 % macro=BetaEnum() 10 10 11 macro=2 44;11 macro=255; -
issm/trunk/src/m/enum/CmGradientEnum.m
r5287 r5468 9 9 % macro=CmGradientEnum() 10 10 11 macro=2 45;11 macro=256; -
issm/trunk/src/m/enum/CmJumpEnum.m
r5287 r5468 9 9 % macro=CmJumpEnum() 10 10 11 macro=2 46;11 macro=257; -
issm/trunk/src/m/enum/CmMaxEnum.m
r5287 r5468 9 9 % macro=CmMaxEnum() 10 10 11 macro=2 47;11 macro=258; -
issm/trunk/src/m/enum/CmMinEnum.m
r5287 r5468 9 9 % macro=CmMinEnum() 10 10 11 macro=2 48;11 macro=259; -
issm/trunk/src/m/enum/ColinearEnum.m
r5287 r5468 9 9 % macro=ColinearEnum() 10 10 11 macro=2 42;11 macro=253; -
issm/trunk/src/m/enum/ConnectivityEnum.m
r5287 r5468 9 9 % macro=ConnectivityEnum() 10 10 11 macro=2 52;11 macro=263; -
issm/trunk/src/m/enum/ControlParameterEnum.m
r5287 r5468 9 9 % macro=ControlParameterEnum() 10 10 11 macro=2 53;11 macro=264; -
issm/trunk/src/m/enum/ControlSteadyEnum.m
r5287 r5468 9 9 % macro=ControlSteadyEnum() 10 10 11 macro=2 54;11 macro=265; -
issm/trunk/src/m/enum/DakotaParameterEnum.m
r5287 r5468 9 9 % macro=DakotaParameterEnum() 10 10 11 macro=2 55;11 macro=266; -
issm/trunk/src/m/enum/DimEnum.m
r5287 r5468 9 9 % macro=DimEnum() 10 10 11 macro=2 56;11 macro=267; -
issm/trunk/src/m/enum/EnumToString.m
r5356 r5468 243 243 case TimeEnum(), string='Time'; return 244 244 case OutputFrequencyEnum(), string='OutputFrequency'; return 245 case MinVelEnum(), string='MinVel'; return 246 case MaxVelEnum(), string='MaxVel'; return 247 case MinVxEnum(), string='MinVx'; return 248 case MaxVxEnum(), string='MaxVx'; return 249 case MaxAbsVxEnum(), string='MaxAbsVx'; return 250 case MinVyEnum(), string='MinVy'; return 251 case MaxVyEnum(), string='MaxVy'; return 252 case MaxAbsVyEnum(), string='MaxAbsVy'; return 253 case MinVzEnum(), string='MinVz'; return 254 case MaxVzEnum(), string='MaxVz'; return 255 case MaxAbsVzEnum(), string='MaxAbsVz'; return 245 256 case RelativeEnum(), string='Relative'; return 246 257 case ResidualEnum(), string='Residual'; return … … 301 312 case QmuOutNameEnum(), string='QmuOutName'; return 302 313 case QmuPartEnum(), string='QmuPart'; return 314 case QmuNumberOfResponsesEnum(), string='QmuNumberOfResponses'; return 315 case IndexedEnum(), string='Indexed'; return 316 case RegularEnum(), string='Regular'; return 317 case IndexEnum(), string='Index'; return 318 case ScaledEnum(), string='Scaled'; return 319 case NodalEnum(), string='Nodal'; return 303 320 case ResponseDescriptorsEnum(), string='ResponseDescriptors'; return 304 321 case SolverStringEnum(), string='SolverString'; return -
issm/trunk/src/m/enum/EpsAbsEnum.m
r5287 r5468 9 9 % macro=EpsAbsEnum() 10 10 11 macro=2 57;11 macro=268; -
issm/trunk/src/m/enum/EpsCmEnum.m
r5287 r5468 9 9 % macro=EpsCmEnum() 10 10 11 macro=2 58;11 macro=269; -
issm/trunk/src/m/enum/EpsRelEnum.m
r5287 r5468 9 9 % macro=EpsRelEnum() 10 10 11 macro=2 59;11 macro=270; -
issm/trunk/src/m/enum/EpsResEnum.m
r5287 r5468 9 9 % macro=EpsResEnum() 10 10 11 macro=2 60;11 macro=271; -
issm/trunk/src/m/enum/GradientEnum.m
r5287 r5468 9 9 % macro=GradientEnum() 10 10 11 macro=2 50;11 macro=261; -
issm/trunk/src/m/enum/GravityEnum.m
r5287 r5468 9 9 % macro=GravityEnum() 10 10 11 macro=2 37;11 macro=248; -
issm/trunk/src/m/enum/HeatCapacityEnum.m
r5287 r5468 9 9 % macro=HeatCapacityEnum() 10 10 11 macro=2 61;11 macro=272; -
issm/trunk/src/m/enum/IntersectEnum.m
r5287 r5468 9 9 % macro=IntersectEnum() 10 10 11 macro=2 41;11 macro=252; -
issm/trunk/src/m/enum/IsHutterEnum.m
r5287 r5468 9 9 % macro=IsHutterEnum() 10 10 11 macro=2 62;11 macro=273; -
issm/trunk/src/m/enum/IsMacAyealPattynEnum.m
r5287 r5468 9 9 % macro=IsMacAyealPattynEnum() 10 10 11 macro=2 63;11 macro=274; -
issm/trunk/src/m/enum/IsStokesEnum.m
r5287 r5468 9 9 % macro=IsStokesEnum() 10 10 11 macro=2 64;11 macro=275; -
issm/trunk/src/m/enum/LatentHeatEnum.m
r5287 r5468 9 9 % macro=LatentHeatEnum() 10 10 11 macro=2 65;11 macro=276; -
issm/trunk/src/m/enum/LowmemEnum.m
r5287 r5468 9 9 % macro=LowmemEnum() 10 10 11 macro=2 66;11 macro=277; -
issm/trunk/src/m/enum/MaxIterEnum.m
r5287 r5468 9 9 % macro=MaxIterEnum() 10 10 11 macro=2 67;11 macro=278; -
issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m
r5287 r5468 9 9 % macro=MaxNonlinearIterationsEnum() 10 10 11 macro=2 68;11 macro=279; -
issm/trunk/src/m/enum/MeltingPointEnum.m
r5287 r5468 9 9 % macro=MeltingPointEnum() 10 10 11 macro=2 69;11 macro=280; -
issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m
r5287 r5468 9 9 % macro=MinMechanicalConstraintsEnum() 10 10 11 macro=2 70;11 macro=281; -
issm/trunk/src/m/enum/MinThermalConstraintsEnum.m
r5287 r5468 9 9 % macro=MinThermalConstraintsEnum() 10 10 11 macro=2 71;11 macro=282; -
issm/trunk/src/m/enum/MixedLayerCapacityEnum.m
r5287 r5468 9 9 % macro=MixedLayerCapacityEnum() 10 10 11 macro=2 39;11 macro=250; -
issm/trunk/src/m/enum/NStepsEnum.m
r5287 r5468 9 9 % macro=NStepsEnum() 10 10 11 macro=2 72;11 macro=283; -
issm/trunk/src/m/enum/NdtEnum.m
r5287 r5468 9 9 % macro=NdtEnum() 10 10 11 macro=2 73;11 macro=284; -
issm/trunk/src/m/enum/NumOutputEnum.m
r5287 r5468 9 9 % macro=NumOutputEnum() 10 10 11 macro=2 74;11 macro=285; -
issm/trunk/src/m/enum/NumRiftsEnum.m
r5287 r5468 9 9 % macro=NumRiftsEnum() 10 10 11 macro=2 75;11 macro=286; -
issm/trunk/src/m/enum/NumberOfElementsEnum.m
r5287 r5468 9 9 % macro=NumberOfElementsEnum() 10 10 11 macro=2 76;11 macro=287; -
issm/trunk/src/m/enum/NumberOfNodesEnum.m
r5287 r5468 9 9 % macro=NumberOfNodesEnum() 10 10 11 macro=2 77;11 macro=288; -
issm/trunk/src/m/enum/NumberOfVerticesEnum.m
r5287 r5468 9 9 % macro=NumberOfVerticesEnum() 10 10 11 macro=2 78;11 macro=289; -
issm/trunk/src/m/enum/OldGradientEnum.m
r5287 r5468 9 9 % macro=OldGradientEnum() 10 10 11 macro=2 51;11 macro=262; -
issm/trunk/src/m/enum/OptScalEnum.m
r5287 r5468 9 9 % macro=OptScalEnum() 10 10 11 macro=2 79;11 macro=290; -
issm/trunk/src/m/enum/OutputFilePointerEnum.m
r5287 r5468 9 9 % macro=OutputFilePointerEnum() 10 10 11 macro=2 80;11 macro=291; -
issm/trunk/src/m/enum/ParameterOutputEnum.m
r5287 r5468 9 9 % macro=ParameterOutputEnum() 10 10 11 macro=2 81;11 macro=292; -
issm/trunk/src/m/enum/PenaltyMeltingEnum.m
r5287 r5468 9 9 % macro=PenaltyMeltingEnum() 10 10 11 macro=2 82;11 macro=293; -
issm/trunk/src/m/enum/QmuAnalysisEnum.m
r5287 r5468 9 9 % macro=QmuAnalysisEnum() 10 10 11 macro=2 83;11 macro=294; -
issm/trunk/src/m/enum/QmuErrNameEnum.m
r5287 r5468 9 9 % macro=QmuErrNameEnum() 10 10 11 macro=2 84;11 macro=295; -
issm/trunk/src/m/enum/QmuInNameEnum.m
r5287 r5468 9 9 % macro=QmuInNameEnum() 10 10 11 macro=2 85;11 macro=296; -
issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m
r5287 r5468 9 9 % macro=QmuMassFluxSegmentsEnum() 10 10 11 macro=2 86;11 macro=297; -
issm/trunk/src/m/enum/QmuNPartEnum.m
r5287 r5468 9 9 % macro=QmuNPartEnum() 10 10 11 macro=2 87;11 macro=298; -
issm/trunk/src/m/enum/QmuOutNameEnum.m
r5287 r5468 9 9 % macro=QmuOutNameEnum() 10 10 11 macro=2 88;11 macro=299; -
issm/trunk/src/m/enum/QmuPartEnum.m
r5287 r5468 9 9 % macro=QmuPartEnum() 10 10 11 macro= 289;11 macro=300; -
issm/trunk/src/m/enum/RelativeEnum.m
r5287 r5468 9 9 % macro=RelativeEnum() 10 10 11 macro=2 32;11 macro=243; -
issm/trunk/src/m/enum/ResidualEnum.m
r5287 r5468 9 9 % macro=ResidualEnum() 10 10 11 macro=2 33;11 macro=244; -
issm/trunk/src/m/enum/ResponseDescriptorsEnum.m
r5287 r5468 9 9 % macro=ResponseDescriptorsEnum() 10 10 11 macro= 290;11 macro=307; -
issm/trunk/src/m/enum/RhoIceEnum.m
r5287 r5468 9 9 % macro=RhoIceEnum() 10 10 11 macro=2 35;11 macro=246; -
issm/trunk/src/m/enum/RhoWaterEnum.m
r5287 r5468 9 9 % macro=RhoWaterEnum() 10 10 11 macro=2 36;11 macro=247; -
issm/trunk/src/m/enum/SeparateEnum.m
r5287 r5468 9 9 % macro=SeparateEnum() 10 10 11 macro=2 43;11 macro=254; -
issm/trunk/src/m/enum/SolverStringEnum.m
r5287 r5468 9 9 % macro=SolverStringEnum() 10 10 11 macro= 291;11 macro=308; -
issm/trunk/src/m/enum/SparsityEnum.m
r5287 r5468 9 9 % macro=SparsityEnum() 10 10 11 macro= 292;11 macro=309; -
issm/trunk/src/m/enum/StringToEnum.m
r5356 r5468 241 241 elseif (strcmpi(name,'Time')), enum=TimeEnum(); return 242 242 elseif (strcmpi(name,'OutputFrequency')), enum=OutputFrequencyEnum(); return 243 elseif (strcmpi(name,'MinVel')), enum=MinVelEnum(); return 244 elseif (strcmpi(name,'MaxVel')), enum=MaxVelEnum(); return 245 elseif (strcmpi(name,'MinVx')), enum=MinVxEnum(); return 246 elseif (strcmpi(name,'MaxVx')), enum=MaxVxEnum(); return 247 elseif (strcmpi(name,'MaxAbsVx')), enum=MaxAbsVxEnum(); return 248 elseif (strcmpi(name,'MinVy')), enum=MinVyEnum(); return 249 elseif (strcmpi(name,'MaxVy')), enum=MaxVyEnum(); return 250 elseif (strcmpi(name,'MaxAbsVy')), enum=MaxAbsVyEnum(); return 251 elseif (strcmpi(name,'MinVz')), enum=MinVzEnum(); return 252 elseif (strcmpi(name,'MaxVz')), enum=MaxVzEnum(); return 253 elseif (strcmpi(name,'MaxAbsVz')), enum=MaxAbsVzEnum(); return 243 254 elseif (strcmpi(name,'Relative')), enum=RelativeEnum(); return 244 255 elseif (strcmpi(name,'Residual')), enum=ResidualEnum(); return … … 299 310 elseif (strcmpi(name,'QmuOutName')), enum=QmuOutNameEnum(); return 300 311 elseif (strcmpi(name,'QmuPart')), enum=QmuPartEnum(); return 312 elseif (strcmpi(name,'QmuNumberOfResponses')), enum=QmuNumberOfResponsesEnum(); return 313 elseif (strcmpi(name,'Indexed')), enum=IndexedEnum(); return 314 elseif (strcmpi(name,'Regular')), enum=RegularEnum(); return 315 elseif (strcmpi(name,'Index')), enum=IndexEnum(); return 316 elseif (strcmpi(name,'Scaled')), enum=ScaledEnum(); return 317 elseif (strcmpi(name,'Nodal')), enum=NodalEnum(); return 301 318 elseif (strcmpi(name,'ResponseDescriptors')), enum=ResponseDescriptorsEnum(); return 302 319 elseif (strcmpi(name,'SolverString')), enum=SolverStringEnum(); return -
issm/trunk/src/m/enum/ThermalConductivityEnum.m
r5287 r5468 9 9 % macro=ThermalConductivityEnum() 10 10 11 macro=2 38;11 macro=249; -
issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m
r5287 r5468 9 9 % macro=ThermalExchangeVelocityEnum() 10 10 11 macro=2 40;11 macro=251; -
issm/trunk/src/m/enum/TolXEnum.m
r5287 r5468 9 9 % macro=TolXEnum() 10 10 11 macro= 293;11 macro=310; -
issm/trunk/src/m/enum/VariableDescriptorsEnum.m
r5287 r5468 9 9 % macro=VariableDescriptorsEnum() 10 10 11 macro= 294;11 macro=311; -
issm/trunk/src/m/enum/VerboseEnum.m
r5287 r5468 9 9 % macro=VerboseEnum() 10 10 11 macro= 295;11 macro=312; -
issm/trunk/src/m/enum/WaitOnLockEnum.m
r5287 r5468 9 9 % macro=WaitOnLockEnum() 10 10 11 macro= 296;11 macro=313; -
issm/trunk/src/m/enum/YtsEnum.m
r5287 r5468 9 9 % macro=YtsEnum() 10 10 11 macro= 297;11 macro=314;
Note:
See TracChangeset
for help on using the changeset viewer.