Changeset 6201
- Timestamp:
- 10/08/10 12:06:21 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 1 added
- 206 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r6200 r6201 174 174 CmNoiseDmpEnum, 175 175 ConstantEnum, 176 NumControlsEnum, 176 177 ControlTypeEnum, 177 178 ConvergedEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r6200 r6201 148 148 case CmNoiseDmpEnum : return "CmNoiseDmp"; 149 149 case ConstantEnum : return "Constant"; 150 case NumControlsEnum : return "NumControls"; 150 151 case ControlTypeEnum : return "ControlType"; 151 152 case ConvergedEnum : return "Converged"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r6200 r6201 146 146 else if (strcmp(name,"CmNoiseDmp")==0) return CmNoiseDmpEnum; 147 147 else if (strcmp(name,"Constant")==0) return ConstantEnum; 148 else if (strcmp(name,"NumControls")==0) return NumControlsEnum; 148 149 else if (strcmp(name,"ControlType")==0) return ControlTypeEnum; 149 150 else if (strcmp(name,"Converged")==0) return ConvergedEnum; -
issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp
r6131 r6201 39 39 IoModelFetchData(&iomodel->thickness_obs,NULL,NULL,iomodel_handle,"thickness_obs"); 40 40 IoModelFetchData(&iomodel->weights,NULL,NULL,iomodel_handle,"weights"); 41 if(iomodel->control_type==DhDtEnum || iomodel->control_type==VxEnum || iomodel->control_type==VyEnum){42 IoModelFetchData(&iomodel->control_parameter,NULL,NULL,iomodel_handle,EnumToModelField(iomodel->control_type)); //copy the control parameter in iomodel43 }44 41 } 45 42 … … 69 66 xfree((void**)&iomodel->thickness_obs); 70 67 xfree((void**)&iomodel->weights); 71 xfree((void**)&iomodel->control_parameter);72 68 } -
issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp
r6200 r6201 15 15 16 16 int i; 17 double* control_parameter=NULL;18 19 17 Parameters* parameters=NULL; 20 18 21 19 /*Get parameters: */ 22 20 parameters=*pparameters; 23 24 21 parameters->AddObject(new BoolParam(ControlAnalysisEnum,iomodel->control_analysis)); 22 25 23 if(iomodel->control_analysis){ 24 25 /*How many controls?*/ 26 parameters->AddObject(new IntParam(NumControlsEnum,iomodel->num_control_type)); 26 27 27 28 /*What control type?*/ … … 31 32 iomodel->control_type!=VxEnum && 32 33 iomodel->control_type!=VyEnum 33 ){ 34 ISSMERROR("control_type %s not supported yet!",EnumToString(iomodel->control_type)); 35 } 36 else{ 37 parameters->AddObject(new IntParam(ControlTypeEnum,iomodel->control_type)); 38 } 34 ) ISSMERROR("control_type %s not supported yet!",EnumToString(iomodel->control_type)); 35 36 parameters->AddObject(new IntParam(ControlTypeEnum,iomodel->control_type)); 39 37 40 38 /*What solution type?*/ … … 69 67 xfree((void**)&iomodel->optscal); 70 68 xfree((void**)&iomodel->maxiter); 71 72 IoModelFetchData(&control_parameter,NULL,NULL,iomodel_handle,EnumToModelField(iomodel->control_type));73 xfree((void**)&control_parameter);74 69 } 75 70 -
issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp
r5358 r6201 40 40 IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,"rheology_B"); 41 41 IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n"); 42 if(iomodel->control_analysis && iomodel->control_type==RheologyBbarEnum){43 IoModelFetchData(&iomodel->control_parameter,NULL,NULL,iomodel_handle,EnumToModelField(iomodel->control_type)); //copy the control parameter in iomodel44 }45 42 46 43 /*Create elements and materials: */ … … 64 61 xfree((void**)&iomodel->rheology_B); 65 62 xfree((void**)&iomodel->rheology_n); 66 xfree((void**)&iomodel->control_parameter);67 63 68 64 /*Add new constrant material property tgo materials, at the end: */ -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp
r5807 r6201 50 50 IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs"); 51 51 IoModelFetchData(&iomodel->weights,NULL,NULL,iomodel_handle,"weights"); 52 if(iomodel->control_type==DragCoefficientEnum){53 IoModelFetchData(&iomodel->control_parameter,NULL,NULL,iomodel_handle,EnumToModelField(iomodel->control_type)); //copy the control parameter in iomodel54 }55 52 } 56 53 … … 90 87 xfree((void**)&iomodel->vy_obs); 91 88 xfree((void**)&iomodel->weights); 92 xfree((void**)&iomodel->control_parameter);93 89 } -
issm/trunk/src/c/objects/IoModel.cpp
r6130 r6201 98 98 xfree((void**)&this->riftinfo); 99 99 xfree((void**)&this->penalties); 100 xfree((void**)&this->control_parameter);101 100 102 101 /*exterior data: */ … … 152 151 153 152 /*Get control parameters: */ 153 IoModelFetchData(&this->num_control_type,iomodel_handle,"num_control_type"); 154 154 IoModelFetchData(&this->control_type,iomodel_handle,"control_type"); 155 155 … … 226 226 this->qmu_analysis=0; 227 227 this->control_analysis=0; 228 this->control_parameter=NULL;229 228 this->numberofvariables=0; 230 229 this->numvariabledescriptors=0; -
issm/trunk/src/c/objects/IoModel.h
r6130 r6201 121 121 122 122 /*control methods: */ 123 int num_control_type; 123 124 int control_type; 124 double* control_parameter;125 125 126 126 /*solution parameters: */ -
issm/trunk/src/m/classes/@model/model.m
r6130 r6201 199 199 md.control_analysis=0; 200 200 md.control_type=0; 201 md.num_control_type=0; 201 202 md.weights=[]; 202 203 md.nsteps=0; -
issm/trunk/src/m/enum/AbsoluteEnum.m
r6200 r6201 9 9 % macro=AbsoluteEnum() 10 10 11 macro=2 49;11 macro=250; -
issm/trunk/src/m/enum/AdjointEnum.m
r6200 r6201 9 9 % macro=AdjointEnum() 10 10 11 macro=26 4;11 macro=265; -
issm/trunk/src/m/enum/BetaEnum.m
r6200 r6201 9 9 % macro=BetaEnum() 10 10 11 macro=2 59;11 macro=260; -
issm/trunk/src/m/enum/BoolExternalResultEnum.m
r6200 r6201 9 9 % macro=BoolExternalResultEnum() 10 10 11 macro=22 3;11 macro=224; -
issm/trunk/src/m/enum/CflCoefficientEnum.m
r6200 r6201 9 9 % macro=CflCoefficientEnum() 10 10 11 macro=14 1;11 macro=142; -
issm/trunk/src/m/enum/CmGradientEnum.m
r6200 r6201 9 9 % macro=CmGradientEnum() 10 10 11 macro=26 0;11 macro=261; -
issm/trunk/src/m/enum/CmJumpEnum.m
r6200 r6201 9 9 % macro=CmJumpEnum() 10 10 11 macro=26 1;11 macro=262; -
issm/trunk/src/m/enum/CmMaxEnum.m
r6200 r6201 9 9 % macro=CmMaxEnum() 10 10 11 macro=26 2;11 macro=263; -
issm/trunk/src/m/enum/CmMinEnum.m
r6200 r6201 9 9 % macro=CmMinEnum() 10 10 11 macro=26 3;11 macro=264; -
issm/trunk/src/m/enum/ColinearEnum.m
r6200 r6201 9 9 % macro=ColinearEnum() 10 10 11 macro=25 7;11 macro=258; -
issm/trunk/src/m/enum/ConnectivityEnum.m
r6200 r6201 9 9 % macro=ConnectivityEnum() 10 10 11 macro=26 7;11 macro=268; -
issm/trunk/src/m/enum/ControlSteadyEnum.m
r6166 r6201 9 9 % macro=ControlSteadyEnum() 10 10 11 macro=26 8;11 macro=269; -
issm/trunk/src/m/enum/ControlTypeEnum.m
r6200 r6201 9 9 % macro=ControlTypeEnum() 10 10 11 macro=13 2;11 macro=133; -
issm/trunk/src/m/enum/ConvergedEnum.m
r6200 r6201 9 9 % macro=ConvergedEnum() 10 10 11 macro=13 3;11 macro=134; -
issm/trunk/src/m/enum/DakotaParameterEnum.m
r6166 r6201 9 9 % macro=DakotaParameterEnum() 10 10 11 macro=2 69;11 macro=270; -
issm/trunk/src/m/enum/DhDtEnum.m
r6200 r6201 9 9 % macro=DhDtEnum() 10 10 11 macro=13 4;11 macro=135; -
issm/trunk/src/m/enum/DimEnum.m
r6166 r6201 9 9 % macro=DimEnum() 10 10 11 macro=27 0;11 macro=271; -
issm/trunk/src/m/enum/DoubleElementResultEnum.m
r6200 r6201 9 9 % macro=DoubleElementResultEnum() 10 10 11 macro=22 0;11 macro=221; -
issm/trunk/src/m/enum/DoubleExternalResultEnum.m
r6200 r6201 9 9 % macro=DoubleExternalResultEnum() 10 10 11 macro=22 4;11 macro=225; -
issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m
r6200 r6201 9 9 % macro=DoubleMatExternalResultEnum() 10 10 11 macro=22 6;11 macro=227; -
issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m
r6200 r6201 9 9 % macro=DoubleVecExternalResultEnum() 10 10 11 macro=22 5;11 macro=226; -
issm/trunk/src/m/enum/DragCoefficientEnum.m
r6200 r6201 9 9 % macro=DragCoefficientEnum() 10 10 11 macro=13 5;11 macro=136; -
issm/trunk/src/m/enum/DragPEnum.m
r6200 r6201 9 9 % macro=DragPEnum() 10 10 11 macro=13 6;11 macro=137; -
issm/trunk/src/m/enum/DragQEnum.m
r6200 r6201 9 9 % macro=DragQEnum() 10 10 11 macro=13 7;11 macro=138; -
issm/trunk/src/m/enum/DragTypeEnum.m
r6200 r6201 9 9 % macro=DragTypeEnum() 10 10 11 macro=13 8;11 macro=139; -
issm/trunk/src/m/enum/DtEnum.m
r6200 r6201 9 9 % macro=DtEnum() 10 10 11 macro=1 39;11 macro=140; -
issm/trunk/src/m/enum/ElementOnBedEnum.m
r6200 r6201 9 9 % macro=ElementOnBedEnum() 10 10 11 macro=14 2;11 macro=143; -
issm/trunk/src/m/enum/ElementOnIceShelfEnum.m
r6200 r6201 9 9 % macro=ElementOnIceShelfEnum() 10 10 11 macro=14 3;11 macro=144; -
issm/trunk/src/m/enum/ElementOnSurfaceEnum.m
r6200 r6201 9 9 % macro=ElementOnSurfaceEnum() 10 10 11 macro=14 4;11 macro=145; -
issm/trunk/src/m/enum/ElementOnWaterEnum.m
r6200 r6201 9 9 % macro=ElementOnWaterEnum() 10 10 11 macro=14 5;11 macro=146; -
issm/trunk/src/m/enum/EnumToString.m
r6200 r6201 143 143 case CmNoiseDmpEnum(), string='CmNoiseDmp'; return 144 144 case ConstantEnum(), string='Constant'; return 145 case NumControlsEnum(), string='NumControls'; return 145 146 case ControlTypeEnum(), string='ControlType'; return 146 147 case ConvergedEnum(), string='Converged'; return -
issm/trunk/src/m/enum/EpsAbsEnum.m
r6166 r6201 9 9 % macro=EpsAbsEnum() 10 10 11 macro=27 1;11 macro=272; -
issm/trunk/src/m/enum/EpsCmEnum.m
r6166 r6201 9 9 % macro=EpsCmEnum() 10 10 11 macro=27 2;11 macro=273; -
issm/trunk/src/m/enum/EpsRelEnum.m
r6166 r6201 9 9 % macro=EpsRelEnum() 10 10 11 macro=27 3;11 macro=274; -
issm/trunk/src/m/enum/EpsResEnum.m
r6166 r6201 9 9 % macro=EpsResEnum() 10 10 11 macro=27 4;11 macro=275; -
issm/trunk/src/m/enum/EpsVelEnum.m
r6200 r6201 9 9 % macro=EpsVelEnum() 10 10 11 macro=14 6;11 macro=147; -
issm/trunk/src/m/enum/ExtToIuEnum.m
r6200 r6201 9 9 % macro=ExtToIuEnum() 10 10 11 macro=15 4;11 macro=155; -
issm/trunk/src/m/enum/FillEnum.m
r6200 r6201 9 9 % macro=FillEnum() 10 10 11 macro=14 7;11 macro=148; -
issm/trunk/src/m/enum/FractionIncrementEnum.m
r6200 r6201 9 9 % macro=FractionIncrementEnum() 10 10 11 macro=14 8;11 macro=149; -
issm/trunk/src/m/enum/FrictionEnum.m
r6200 r6201 9 9 % macro=FrictionEnum() 10 10 11 macro=1 49;11 macro=150; -
issm/trunk/src/m/enum/FsetEnum.m
r6166 r6201 9 9 % macro=FsetEnum() 10 10 11 macro=32 1;11 macro=322; -
issm/trunk/src/m/enum/GeothermalFluxEnum.m
r6200 r6201 9 9 % macro=GeothermalFluxEnum() 10 10 11 macro=15 0;11 macro=151; -
issm/trunk/src/m/enum/GradientEnum.m
r6200 r6201 9 9 % macro=GradientEnum() 10 10 11 macro=26 5;11 macro=266; -
issm/trunk/src/m/enum/GravityEnum.m
r6200 r6201 9 9 % macro=GravityEnum() 10 10 11 macro=25 2;11 macro=253; -
issm/trunk/src/m/enum/GsetEnum.m
r6166 r6201 9 9 % macro=GsetEnum() 10 10 11 macro=32 0;11 macro=321; -
issm/trunk/src/m/enum/HeatCapacityEnum.m
r6166 r6201 9 9 % macro=HeatCapacityEnum() 10 10 11 macro=27 5;11 macro=276; -
issm/trunk/src/m/enum/IndexEnum.m
r6166 r6201 9 9 % macro=IndexEnum() 10 10 11 macro=30 8;11 macro=309; -
issm/trunk/src/m/enum/IndexedEnum.m
r6166 r6201 9 9 % macro=IndexedEnum() 10 10 11 macro=30 6;11 macro=307; -
issm/trunk/src/m/enum/IntExternalResultEnum.m
r6200 r6201 9 9 % macro=IntExternalResultEnum() 10 10 11 macro=22 7;11 macro=228; -
issm/trunk/src/m/enum/InternalEnum.m
r6200 r6201 9 9 % macro=InternalEnum() 10 10 11 macro=15 1;11 macro=152; -
issm/trunk/src/m/enum/IntersectEnum.m
r6200 r6201 9 9 % macro=IntersectEnum() 10 10 11 macro=25 6;11 macro=257; -
issm/trunk/src/m/enum/IsHutterEnum.m
r6166 r6201 9 9 % macro=IsHutterEnum() 10 10 11 macro=27 6;11 macro=277; -
issm/trunk/src/m/enum/IsMacAyealPattynEnum.m
r6166 r6201 9 9 % macro=IsMacAyealPattynEnum() 10 10 11 macro=27 7;11 macro=278; -
issm/trunk/src/m/enum/IsStokesEnum.m
r6166 r6201 9 9 % macro=IsStokesEnum() 10 10 11 macro=27 8;11 macro=279; -
issm/trunk/src/m/enum/IuToExtEnum.m
r6200 r6201 9 9 % macro=IuToExtEnum() 10 10 11 macro=15 3;11 macro=154; -
issm/trunk/src/m/enum/JEnum.m
r6200 r6201 9 9 % macro=JEnum() 10 10 11 macro=23 0;11 macro=231; -
issm/trunk/src/m/enum/KffEnum.m
r6166 r6201 9 9 % macro=KffEnum() 10 10 11 macro=2 79;11 macro=280; -
issm/trunk/src/m/enum/KflagEnum.m
r6200 r6201 9 9 % macro=KflagEnum() 10 10 11 macro=15 2;11 macro=153; -
issm/trunk/src/m/enum/LatentHeatEnum.m
r6166 r6201 9 9 % macro=LatentHeatEnum() 10 10 11 macro=28 0;11 macro=281; -
issm/trunk/src/m/enum/LowmemEnum.m
r6166 r6201 9 9 % macro=LowmemEnum() 10 10 11 macro=28 1;11 macro=282; -
issm/trunk/src/m/enum/MassFluxEnum.m
r6200 r6201 9 9 % macro=MassFluxEnum() 10 10 11 macro=15 5;11 macro=156; -
issm/trunk/src/m/enum/MaxAbsVxEnum.m
r6200 r6201 9 9 % macro=MaxAbsVxEnum() 10 10 11 macro=24 0;11 macro=241; -
issm/trunk/src/m/enum/MaxAbsVyEnum.m
r6200 r6201 9 9 % macro=MaxAbsVyEnum() 10 10 11 macro=24 3;11 macro=244; -
issm/trunk/src/m/enum/MaxAbsVzEnum.m
r6200 r6201 9 9 % macro=MaxAbsVzEnum() 10 10 11 macro=24 6;11 macro=247; -
issm/trunk/src/m/enum/MaxIterEnum.m
r6166 r6201 9 9 % macro=MaxIterEnum() 10 10 11 macro=28 2;11 macro=283; -
issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m
r6166 r6201 9 9 % macro=MaxNonlinearIterationsEnum() 10 10 11 macro=28 3;11 macro=284; -
issm/trunk/src/m/enum/MaxPenetrationEnum.m
r6200 r6201 9 9 % macro=MaxPenetrationEnum() 10 10 11 macro=16 2;11 macro=163; -
issm/trunk/src/m/enum/MaxVelEnum.m
r6200 r6201 9 9 % macro=MaxVelEnum() 10 10 11 macro=23 7;11 macro=238; -
issm/trunk/src/m/enum/MaxVxEnum.m
r6200 r6201 9 9 % macro=MaxVxEnum() 10 10 11 macro=2 39;11 macro=240; -
issm/trunk/src/m/enum/MaxVyEnum.m
r6200 r6201 9 9 % macro=MaxVyEnum() 10 10 11 macro=24 2;11 macro=243; -
issm/trunk/src/m/enum/MaxVzEnum.m
r6200 r6201 9 9 % macro=MaxVzEnum() 10 10 11 macro=24 5;11 macro=246; -
issm/trunk/src/m/enum/MeanVelEnum.m
r6200 r6201 9 9 % macro=MeanVelEnum() 10 10 11 macro=16 3;11 macro=164; -
issm/trunk/src/m/enum/MeltingOffsetEnum.m
r6200 r6201 9 9 % macro=MeltingOffsetEnum() 10 10 11 macro=16 4;11 macro=165; -
issm/trunk/src/m/enum/MeltingPointEnum.m
r6166 r6201 9 9 % macro=MeltingPointEnum() 10 10 11 macro=28 4;11 macro=285; -
issm/trunk/src/m/enum/MeltingRateEnum.m
r6200 r6201 9 9 % macro=MeltingRateEnum() 10 10 11 macro=16 5;11 macro=166; -
issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m
r6166 r6201 9 9 % macro=MinMechanicalConstraintsEnum() 10 10 11 macro=28 5;11 macro=286; -
issm/trunk/src/m/enum/MinThermalConstraintsEnum.m
r6166 r6201 9 9 % macro=MinThermalConstraintsEnum() 10 10 11 macro=28 6;11 macro=287; -
issm/trunk/src/m/enum/MinVelEnum.m
r6200 r6201 9 9 % macro=MinVelEnum() 10 10 11 macro=23 6;11 macro=237; -
issm/trunk/src/m/enum/MinVxEnum.m
r6200 r6201 9 9 % macro=MinVxEnum() 10 10 11 macro=23 8;11 macro=239; -
issm/trunk/src/m/enum/MinVyEnum.m
r6200 r6201 9 9 % macro=MinVyEnum() 10 10 11 macro=24 1;11 macro=242; -
issm/trunk/src/m/enum/MinVzEnum.m
r6200 r6201 9 9 % macro=MinVzEnum() 10 10 11 macro=24 4;11 macro=245; -
issm/trunk/src/m/enum/MiniEnum.m
r6200 r6201 9 9 % macro=MiniEnum() 10 10 11 macro=2 19;11 macro=220; -
issm/trunk/src/m/enum/MisfitEnum.m
r6200 r6201 9 9 % macro=MisfitEnum() 10 10 11 macro=16 6;11 macro=167; -
issm/trunk/src/m/enum/MixedLayerCapacityEnum.m
r6200 r6201 9 9 % macro=MixedLayerCapacityEnum() 10 10 11 macro=25 4;11 macro=255; -
issm/trunk/src/m/enum/NStepsEnum.m
r6166 r6201 9 9 % macro=NStepsEnum() 10 10 11 macro=28 7;11 macro=288; -
issm/trunk/src/m/enum/NdtEnum.m
r6166 r6201 9 9 % macro=NdtEnum() 10 10 11 macro=28 8;11 macro=289; -
issm/trunk/src/m/enum/NodalEnum.m
r6166 r6201 9 9 % macro=NodalEnum() 10 10 11 macro=31 0;11 macro=311; -
issm/trunk/src/m/enum/NodeOnBedEnum.m
r6200 r6201 9 9 % macro=NodeOnBedEnum() 10 10 11 macro=16 7;11 macro=168; -
issm/trunk/src/m/enum/NodeOnIceSheetEnum.m
r6200 r6201 9 9 % macro=NodeOnIceSheetEnum() 10 10 11 macro=16 8;11 macro=169; -
issm/trunk/src/m/enum/NodeOnIceShelfEnum.m
r6200 r6201 9 9 % macro=NodeOnIceShelfEnum() 10 10 11 macro=1 69;11 macro=170; -
issm/trunk/src/m/enum/NodeOnSurfaceEnum.m
r6200 r6201 9 9 % macro=NodeOnSurfaceEnum() 10 10 11 macro=17 0;11 macro=171; -
issm/trunk/src/m/enum/NumOutputEnum.m
r6166 r6201 9 9 % macro=NumOutputEnum() 10 10 11 macro=2 89;11 macro=290; -
issm/trunk/src/m/enum/NumRiftsEnum.m
r6166 r6201 9 9 % macro=NumRiftsEnum() 10 10 11 macro=29 0;11 macro=291; -
issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m
r6200 r6201 9 9 % macro=NumberNodeToElementConnectivityEnum() 10 10 11 macro=17 1;11 macro=172; -
issm/trunk/src/m/enum/NumberOfElementsEnum.m
r6166 r6201 9 9 % macro=NumberOfElementsEnum() 10 10 11 macro=29 1;11 macro=292; -
issm/trunk/src/m/enum/NumberOfNodesEnum.m
r6166 r6201 9 9 % macro=NumberOfNodesEnum() 10 10 11 macro=29 2;11 macro=293; -
issm/trunk/src/m/enum/NumberOfVerticesEnum.m
r6166 r6201 9 9 % macro=NumberOfVerticesEnum() 10 10 11 macro=29 3;11 macro=294; -
issm/trunk/src/m/enum/OldGradientEnum.m
r6200 r6201 9 9 % macro=OldGradientEnum() 10 10 11 macro=26 6;11 macro=267; -
issm/trunk/src/m/enum/OptScalEnum.m
r6166 r6201 9 9 % macro=OptScalEnum() 10 10 11 macro=29 4;11 macro=295; -
issm/trunk/src/m/enum/OutputFilePointerEnum.m
r6166 r6201 9 9 % macro=OutputFilePointerEnum() 10 10 11 macro=29 5;11 macro=296; -
issm/trunk/src/m/enum/OutputFrequencyEnum.m
r6200 r6201 9 9 % macro=OutputFrequencyEnum() 10 10 11 macro=23 5;11 macro=236; -
issm/trunk/src/m/enum/P0Enum.m
r6200 r6201 9 9 % macro=P0Enum() 10 10 11 macro=21 6;11 macro=217; -
issm/trunk/src/m/enum/P1DGEnum.m
r6200 r6201 9 9 % macro=P1DGEnum() 10 10 11 macro=21 8;11 macro=219; -
issm/trunk/src/m/enum/P1Enum.m
r6200 r6201 9 9 % macro=P1Enum() 10 10 11 macro=21 7;11 macro=218; -
issm/trunk/src/m/enum/ParameterOutputEnum.m
r6166 r6201 9 9 % macro=ParameterOutputEnum() 10 10 11 macro=29 6;11 macro=297; -
issm/trunk/src/m/enum/PatchEnum.m
r6200 r6201 9 9 % macro=PatchEnum() 10 10 11 macro=23 1;11 macro=232; -
issm/trunk/src/m/enum/PatchNodesEnum.m
r6200 r6201 9 9 % macro=PatchNodesEnum() 10 10 11 macro=23 3;11 macro=234; -
issm/trunk/src/m/enum/PatchVerticesEnum.m
r6200 r6201 9 9 % macro=PatchVerticesEnum() 10 10 11 macro=23 2;11 macro=233; -
issm/trunk/src/m/enum/PenaltyMeltingEnum.m
r6166 r6201 9 9 % macro=PenaltyMeltingEnum() 10 10 11 macro=29 7;11 macro=298; -
issm/trunk/src/m/enum/PenaltyOffsetEnum.m
r6200 r6201 9 9 % macro=PenaltyOffsetEnum() 10 10 11 macro=17 2;11 macro=173; -
issm/trunk/src/m/enum/PentaVertexElementResultEnum.m
r6200 r6201 9 9 % macro=PentaVertexElementResultEnum() 10 10 11 macro=22 2;11 macro=223; -
issm/trunk/src/m/enum/PetscOptionsAnalysesEnum.m
r6166 r6201 9 9 % macro=PetscOptionsAnalysesEnum() 10 10 11 macro=3 19;11 macro=320; -
issm/trunk/src/m/enum/PetscOptionsStringsEnum.m
r6166 r6201 9 9 % macro=PetscOptionsStringsEnum() 10 10 11 macro=31 8;11 macro=319; -
issm/trunk/src/m/enum/PetscRcEnum.m
r6166 r6201 9 9 % macro=PetscRcEnum() 10 10 11 macro=31 2;11 macro=313; -
issm/trunk/src/m/enum/PetscVecExternalResultEnum.m
r6200 r6201 9 9 % macro=PetscVecExternalResultEnum() 10 10 11 macro=22 8;11 macro=229; -
issm/trunk/src/m/enum/PflagEnum.m
r6200 r6201 9 9 % macro=PflagEnum() 10 10 11 macro=17 3;11 macro=174; -
issm/trunk/src/m/enum/PressureEnum.m
r6200 r6201 9 9 % macro=PressureEnum() 10 10 11 macro=17 4;11 macro=175; -
issm/trunk/src/m/enum/PressureOldEnum.m
r6200 r6201 9 9 % macro=PressureOldEnum() 10 10 11 macro=17 5;11 macro=176; -
issm/trunk/src/m/enum/QmuAnalysisEnum.m
r6166 r6201 9 9 % macro=QmuAnalysisEnum() 10 10 11 macro=29 8;11 macro=299; -
issm/trunk/src/m/enum/QmuErrNameEnum.m
r6166 r6201 9 9 % macro=QmuErrNameEnum() 10 10 11 macro= 299;11 macro=300; -
issm/trunk/src/m/enum/QmuInNameEnum.m
r6166 r6201 9 9 % macro=QmuInNameEnum() 10 10 11 macro=30 0;11 macro=301; -
issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m
r6166 r6201 9 9 % macro=QmuMassFluxSegmentsEnum() 10 10 11 macro=30 1;11 macro=302; -
issm/trunk/src/m/enum/QmuNPartEnum.m
r6166 r6201 9 9 % macro=QmuNPartEnum() 10 10 11 macro=30 2;11 macro=303; -
issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m
r6166 r6201 9 9 % macro=QmuNumberOfResponsesEnum() 10 10 11 macro=30 5;11 macro=306; -
issm/trunk/src/m/enum/QmuOutNameEnum.m
r6166 r6201 9 9 % macro=QmuOutNameEnum() 10 10 11 macro=30 3;11 macro=304; -
issm/trunk/src/m/enum/QmuPartEnum.m
r6166 r6201 9 9 % macro=QmuPartEnum() 10 10 11 macro=30 4;11 macro=305; -
issm/trunk/src/m/enum/QmuPressureEnum.m
r6200 r6201 9 9 % macro=QmuPressureEnum() 10 10 11 macro=17 6;11 macro=177; -
issm/trunk/src/m/enum/QmuVxEnum.m
r6200 r6201 9 9 % macro=QmuVxEnum() 10 10 11 macro=20 1;11 macro=202; -
issm/trunk/src/m/enum/QmuVyEnum.m
r6200 r6201 9 9 % macro=QmuVyEnum() 10 10 11 macro=20 6;11 macro=207; -
issm/trunk/src/m/enum/QmuVzEnum.m
r6200 r6201 9 9 % macro=QmuVzEnum() 10 10 11 macro=21 4;11 macro=215; -
issm/trunk/src/m/enum/RegularEnum.m
r6166 r6201 9 9 % macro=RegularEnum() 10 10 11 macro=30 7;11 macro=308; -
issm/trunk/src/m/enum/RelativeEnum.m
r6200 r6201 9 9 % macro=RelativeEnum() 10 10 11 macro=24 7;11 macro=248; -
issm/trunk/src/m/enum/ResetPenaltiesEnum.m
r6200 r6201 9 9 % macro=ResetPenaltiesEnum() 10 10 11 macro=17 7;11 macro=178; -
issm/trunk/src/m/enum/ResidualEnum.m
r6200 r6201 9 9 % macro=ResidualEnum() 10 10 11 macro=24 8;11 macro=249; -
issm/trunk/src/m/enum/ResponseDescriptorsEnum.m
r6166 r6201 9 9 % macro=ResponseDescriptorsEnum() 10 10 11 macro=31 1;11 macro=312; -
issm/trunk/src/m/enum/RheologyBEnum.m
r6200 r6201 9 9 % macro=RheologyBEnum() 10 10 11 macro=17 8;11 macro=179; -
issm/trunk/src/m/enum/RheologyBbarEnum.m
r6200 r6201 9 9 % macro=RheologyBbarEnum() 10 10 11 macro=1 79;11 macro=180; -
issm/trunk/src/m/enum/RheologyNEnum.m
r6200 r6201 9 9 % macro=RheologyNEnum() 10 10 11 macro=18 0;11 macro=181; -
issm/trunk/src/m/enum/RhoIceEnum.m
r6200 r6201 9 9 % macro=RhoIceEnum() 10 10 11 macro=25 0;11 macro=251; -
issm/trunk/src/m/enum/RhoWaterEnum.m
r6200 r6201 9 9 % macro=RhoWaterEnum() 10 10 11 macro=25 1;11 macro=252; -
issm/trunk/src/m/enum/ScaledEnum.m
r6166 r6201 9 9 % macro=ScaledEnum() 10 10 11 macro=3 09;11 macro=310; -
issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m
r6200 r6201 9 9 % macro=SegmentOnIceShelfEnum() 10 10 11 macro=18 1;11 macro=182; -
issm/trunk/src/m/enum/SeparateEnum.m
r6200 r6201 9 9 % macro=SeparateEnum() 10 10 11 macro=25 8;11 macro=259; -
issm/trunk/src/m/enum/SparsityEnum.m
r6166 r6201 9 9 % macro=SparsityEnum() 10 10 11 macro=31 3;11 macro=314; -
issm/trunk/src/m/enum/SsetEnum.m
r6166 r6201 9 9 % macro=SsetEnum() 10 10 11 macro=32 2;11 macro=323; -
issm/trunk/src/m/enum/StabilizeConstraintsEnum.m
r6200 r6201 9 9 % macro=StabilizeConstraintsEnum() 10 10 11 macro=18 2;11 macro=183; -
issm/trunk/src/m/enum/StokesReconditioningEnum.m
r6200 r6201 9 9 % macro=StokesReconditioningEnum() 10 10 11 macro=18 3;11 macro=184; -
issm/trunk/src/m/enum/StringExternalResultEnum.m
r6200 r6201 9 9 % macro=StringExternalResultEnum() 10 10 11 macro=2 29;11 macro=230; -
issm/trunk/src/m/enum/StringToEnum.m
r6200 r6201 141 141 elseif (strcmpi(name,'CmNoiseDmp')), enum=CmNoiseDmpEnum(); return 142 142 elseif (strcmpi(name,'Constant')), enum=ConstantEnum(); return 143 elseif (strcmpi(name,'NumControls')), enum=NumControlsEnum(); return 143 144 elseif (strcmpi(name,'ControlType')), enum=ControlTypeEnum(); return 144 145 elseif (strcmpi(name,'Converged')), enum=ConvergedEnum(); return -
issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m
r6200 r6201 9 9 % macro=SurfaceAbsVelMisfitEnum() 10 10 11 macro=15 7;11 macro=158; -
issm/trunk/src/m/enum/SurfaceAreaEnum.m
r6200 r6201 9 9 % macro=SurfaceAreaEnum() 10 10 11 macro=18 4;11 macro=185; -
issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m
r6200 r6201 9 9 % macro=SurfaceAverageVelMisfitEnum() 10 10 11 macro=16 1;11 macro=162; -
issm/trunk/src/m/enum/SurfaceEnum.m
r6200 r6201 9 9 % macro=SurfaceEnum() 10 10 11 macro=18 5;11 macro=186; -
issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m
r6200 r6201 9 9 % macro=SurfaceLogVelMisfitEnum() 10 10 11 macro=1 59;11 macro=160; -
issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m
r6200 r6201 9 9 % macro=SurfaceLogVxVyMisfitEnum() 10 10 11 macro=16 0;11 macro=161; -
issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m
r6200 r6201 9 9 % macro=SurfaceRelVelMisfitEnum() 10 10 11 macro=15 8;11 macro=159; -
issm/trunk/src/m/enum/SurfaceSlopeXEnum.m
r6200 r6201 9 9 % macro=SurfaceSlopeXEnum() 10 10 11 macro=18 6;11 macro=187; -
issm/trunk/src/m/enum/SurfaceSlopeYEnum.m
r6200 r6201 9 9 % macro=SurfaceSlopeYEnum() 10 10 11 macro=18 7;11 macro=188; -
issm/trunk/src/m/enum/TemperatureEnum.m
r6200 r6201 9 9 % macro=TemperatureEnum() 10 10 11 macro=18 8;11 macro=189; -
issm/trunk/src/m/enum/TemperatureOldEnum.m
r6200 r6201 9 9 % macro=TemperatureOldEnum() 10 10 11 macro=19 0;11 macro=191; -
issm/trunk/src/m/enum/TemporaryTemperatureEnum.m
r6200 r6201 9 9 % macro=TemporaryTemperatureEnum() 10 10 11 macro=1 89;11 macro=190; -
issm/trunk/src/m/enum/ThermalConductivityEnum.m
r6200 r6201 9 9 % macro=ThermalConductivityEnum() 10 10 11 macro=25 3;11 macro=254; -
issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m
r6200 r6201 9 9 % macro=ThermalExchangeVelocityEnum() 10 10 11 macro=25 5;11 macro=256; -
issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m
r6200 r6201 9 9 % macro=ThicknessAbsMisfitEnum() 10 10 11 macro=15 6;11 macro=157; -
issm/trunk/src/m/enum/ThicknessEnum.m
r6200 r6201 9 9 % macro=ThicknessEnum() 10 10 11 macro=19 1;11 macro=192; -
issm/trunk/src/m/enum/ThicknessObsEnum.m
r6200 r6201 9 9 % macro=ThicknessObsEnum() 10 10 11 macro=19 2;11 macro=193; -
issm/trunk/src/m/enum/TimeAdaptEnum.m
r6200 r6201 9 9 % macro=TimeAdaptEnum() 10 10 11 macro=14 0;11 macro=141; -
issm/trunk/src/m/enum/TimeEnum.m
r6200 r6201 9 9 % macro=TimeEnum() 10 10 11 macro=23 4;11 macro=235; -
issm/trunk/src/m/enum/TolXEnum.m
r6166 r6201 9 9 % macro=TolXEnum() 10 10 11 macro=31 4;11 macro=315; -
issm/trunk/src/m/enum/TriaVertexElementResultEnum.m
r6200 r6201 9 9 % macro=TriaVertexElementResultEnum() 10 10 11 macro=22 1;11 macro=222; -
issm/trunk/src/m/enum/TypeEnum.m
r6200 r6201 9 9 % macro=TypeEnum() 10 10 11 macro=19 3;11 macro=194; -
issm/trunk/src/m/enum/VariableDescriptorsEnum.m
r6166 r6201 9 9 % macro=VariableDescriptorsEnum() 10 10 11 macro=31 5;11 macro=316; -
issm/trunk/src/m/enum/VelEnum.m
r6200 r6201 9 9 % macro=VelEnum() 10 10 11 macro=19 4;11 macro=195; -
issm/trunk/src/m/enum/VelObsEnum.m
r6200 r6201 9 9 % macro=VelObsEnum() 10 10 11 macro=19 5;11 macro=196; -
issm/trunk/src/m/enum/VerboseEnum.m
r6166 r6201 9 9 % macro=VerboseEnum() 10 10 11 macro=31 6;11 macro=317; -
issm/trunk/src/m/enum/ViscosityOvershootEnum.m
r6200 r6201 9 9 % macro=ViscosityOvershootEnum() 10 10 11 macro=19 6;11 macro=197; -
issm/trunk/src/m/enum/VxAverageEnum.m
r6200 r6201 9 9 % macro=VxAverageEnum() 10 10 11 macro=19 7;11 macro=198; -
issm/trunk/src/m/enum/VxEnum.m
r6200 r6201 9 9 % macro=VxEnum() 10 10 11 macro=19 8;11 macro=199; -
issm/trunk/src/m/enum/VxObsEnum.m
r6200 r6201 9 9 % macro=VxObsEnum() 10 10 11 macro= 199;11 macro=200; -
issm/trunk/src/m/enum/VxOldEnum.m
r6200 r6201 9 9 % macro=VxOldEnum() 10 10 11 macro=20 0;11 macro=201; -
issm/trunk/src/m/enum/VyAverageEnum.m
r6200 r6201 9 9 % macro=VyAverageEnum() 10 10 11 macro=20 2;11 macro=203; -
issm/trunk/src/m/enum/VyEnum.m
r6200 r6201 9 9 % macro=VyEnum() 10 10 11 macro=20 3;11 macro=204; -
issm/trunk/src/m/enum/VyObsEnum.m
r6200 r6201 9 9 % macro=VyObsEnum() 10 10 11 macro=20 4;11 macro=205; -
issm/trunk/src/m/enum/VyOldEnum.m
r6200 r6201 9 9 % macro=VyOldEnum() 10 10 11 macro=20 5;11 macro=206; -
issm/trunk/src/m/enum/VzAverageEnum.m
r6200 r6201 9 9 % macro=VzAverageEnum() 10 10 11 macro=20 7;11 macro=208; -
issm/trunk/src/m/enum/VzEnum.m
r6200 r6201 9 9 % macro=VzEnum() 10 10 11 macro=20 8;11 macro=209; -
issm/trunk/src/m/enum/VzMacAyealEnum.m
r6200 r6201 9 9 % macro=VzMacAyealEnum() 10 10 11 macro=21 1;11 macro=212; -
issm/trunk/src/m/enum/VzObsEnum.m
r6200 r6201 9 9 % macro=VzObsEnum() 10 10 11 macro=2 09;11 macro=210; -
issm/trunk/src/m/enum/VzOldEnum.m
r6200 r6201 9 9 % macro=VzOldEnum() 10 10 11 macro=21 0;11 macro=211; -
issm/trunk/src/m/enum/VzPattynEnum.m
r6200 r6201 9 9 % macro=VzPattynEnum() 10 10 11 macro=21 2;11 macro=213; -
issm/trunk/src/m/enum/VzStokesEnum.m
r6200 r6201 9 9 % macro=VzStokesEnum() 10 10 11 macro=21 3;11 macro=214; -
issm/trunk/src/m/enum/WaitOnLockEnum.m
r6166 r6201 9 9 % macro=WaitOnLockEnum() 10 10 11 macro=31 7;11 macro=318; -
issm/trunk/src/m/enum/WeightsEnum.m
r6200 r6201 9 9 % macro=WeightsEnum() 10 10 11 macro=21 5;11 macro=216; -
issm/trunk/src/m/enum/YtsEnum.m
r6166 r6201 9 9 % macro=YtsEnum() 10 10 11 macro=32 3;11 macro=324; -
issm/trunk/src/m/model/marshall.m
r6130 r6201 99 99 %Control methods 100 100 WriteData(fid,md.control_analysis,'Integer','control_analysis'); 101 WriteData(fid,md.num_control_type,'Integer','num_control_type'); 101 102 WriteData(fid,md.control_type,'Integer','control_type'); 102 103 -
issm/trunk/src/m/model/presolve.m
r6014 r6201 8 8 md.inputfilename=[md.name '.bin']; 9 9 md.outputfilename=[md.name '.outbin']; 10 11 %deal with control methods 12 if ~md.control_analysis 13 md.num_control_type=0; 14 else 15 md.num_control_type=numel(md.control_type); 16 end 10 17 11 18 %deal with rifts.
Note:
See TracChangeset
for help on using the changeset viewer.