Changeset 5282

Timestamp:

08/16/10 11:37:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved md.fit to md.cm_responses and 0-4 to enums

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/@model/setdefaultparameters.m (modified) (1 diff)
• classes/public/ismodelselfconsistent.m (modified) (1 diff)
• classes/public/marshall.m (modified) (1 diff)
• enum/AbsoluteEnum.m (modified) (1 diff)
• enum/AdjointEnum.m (modified) (1 diff)
• enum/BetaEnum.m (modified) (1 diff)
• enum/BoolExternalResultEnum.m (modified) (1 diff)
• enum/CmGradientEnum.m (modified) (1 diff)
• enum/CmJumpEnum.m (modified) (1 diff)
• enum/CmMaxDmpSlopeEnum.m (modified) (1 diff)
• enum/CmMaxDmpValueEnum.m (modified) (1 diff)
• enum/CmMaxEnum.m (modified) (1 diff)
• enum/CmMinDmpSlopeEnum.m (modified) (1 diff)
• enum/CmMinDmpValueEnum.m (modified) (1 diff)
• enum/CmMinEnum.m (modified) (1 diff)
• enum/CmNoiseDmpEnum.m (modified) (1 diff)
• enum/ColinearEnum.m (modified) (1 diff)
• enum/ConnectivityEnum.m (modified) (1 diff)
• enum/ConstantEnum.m (modified) (1 diff)
• enum/ControlParameterEnum.m (modified) (1 diff)
• enum/ControlSteadyEnum.m (modified) (1 diff)
• enum/ControlTypeEnum.m (modified) (1 diff)
• enum/ConvergedEnum.m (modified) (1 diff)
• enum/DakotaParameterEnum.m (modified) (1 diff)
• enum/DhDtEnum.m (modified) (1 diff)
• enum/DimEnum.m (modified) (1 diff)
• enum/DoubleElementResultEnum.m (modified) (1 diff)
• enum/DoubleExternalResultEnum.m (modified) (1 diff)
• enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
• enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
• enum/DragCoefficientEnum.m (modified) (1 diff)
• enum/DragPEnum.m (modified) (1 diff)
• enum/DragQEnum.m (modified) (1 diff)
• enum/DragTypeEnum.m (modified) (1 diff)
• enum/DtEnum.m (modified) (1 diff)
• enum/ElementOnBedEnum.m (modified) (1 diff)
• enum/ElementOnIceShelfEnum.m (modified) (1 diff)
• enum/ElementOnSurfaceEnum.m (modified) (1 diff)
• enum/ElementOnWaterEnum.m (modified) (1 diff)
• enum/EnumToString.m (modified) (3 diffs)
• enum/EpsAbsEnum.m (modified) (1 diff)
• enum/EpsCmEnum.m (modified) (1 diff)
• enum/EpsRelEnum.m (modified) (1 diff)
• enum/EpsResEnum.m (modified) (1 diff)
• enum/EpsVelEnum.m (modified) (1 diff)
• enum/FillEnum.m (modified) (1 diff)
• enum/FractionIncrementEnum.m (modified) (1 diff)
• enum/FrictionEnum.m (modified) (1 diff)
• enum/GeothermalFluxEnum.m (modified) (1 diff)
• enum/GradientEnum.m (modified) (1 diff)
• enum/GravityEnum.m (modified) (1 diff)
• enum/HeatCapacityEnum.m (modified) (1 diff)
• enum/IntExternalResultEnum.m (modified) (1 diff)
• enum/InternalEnum.m (modified) (1 diff)
• enum/IntersectEnum.m (modified) (1 diff)
• enum/IsHutterEnum.m (modified) (1 diff)
• enum/IsMacAyealPattynEnum.m (modified) (1 diff)
• enum/IsStokesEnum.m (modified) (1 diff)
• enum/JEnum.m (modified) (1 diff)
• enum/KflagEnum.m (modified) (1 diff)
• enum/LatentHeatEnum.m (modified) (1 diff)
• enum/LowmemEnum.m (modified) (1 diff)
• enum/MassFluxEnum.m (modified) (1 diff)
• enum/MaxIterEnum.m (modified) (1 diff)
• enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
• enum/MaxPenetrationEnum.m (modified) (1 diff)
• enum/MeanVelEnum.m (modified) (1 diff)
• enum/MeltingOffsetEnum.m (modified) (1 diff)
• enum/MeltingPointEnum.m (modified) (1 diff)
• enum/MeltingRateEnum.m (modified) (1 diff)
• enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• enum/MiniEnum.m (modified) (1 diff)
• enum/MisfitEnum.m (modified) (1 diff)
• enum/MixedLayerCapacityEnum.m (modified) (1 diff)
• enum/NStepsEnum.m (modified) (1 diff)
• enum/NdtEnum.m (modified) (1 diff)
• enum/NodeOnBedEnum.m (modified) (1 diff)
• enum/NodeOnIceSheetEnum.m (modified) (1 diff)
• enum/NodeOnIceShelfEnum.m (modified) (1 diff)
• enum/NodeOnSurfaceEnum.m (modified) (1 diff)
• enum/NumOutputEnum.m (modified) (1 diff)
• enum/NumRiftsEnum.m (modified) (1 diff)
• enum/NumberNodeToElementConnectivityEnum.m (modified) (1 diff)
• enum/NumberOfElementsEnum.m (modified) (1 diff)
• enum/NumberOfNodesEnum.m (modified) (1 diff)
• enum/NumberOfVerticesEnum.m (modified) (1 diff)
• enum/OldGradientEnum.m (modified) (1 diff)
• enum/OptScalEnum.m (modified) (1 diff)
• enum/OutputFilePointerEnum.m (modified) (1 diff)
• enum/OutputFrequencyEnum.m (modified) (1 diff)
• enum/P0Enum.m (modified) (1 diff)
• enum/P1DGEnum.m (modified) (1 diff)
• enum/P1Enum.m (modified) (1 diff)
• enum/ParameterOutputEnum.m (modified) (1 diff)
• enum/PatchEnum.m (modified) (1 diff)
• enum/PatchNodesEnum.m (modified) (1 diff)
• enum/PatchVerticesEnum.m (modified) (1 diff)
• enum/PenaltyMeltingEnum.m (modified) (1 diff)
• enum/PenaltyOffsetEnum.m (modified) (1 diff)
• enum/PentaVertexElementResultEnum.m (modified) (1 diff)
• enum/PetscVecExternalResultEnum.m (modified) (1 diff)
• enum/PflagEnum.m (modified) (1 diff)
• enum/PressureEnum.m (modified) (1 diff)
• enum/PressureOldEnum.m (modified) (1 diff)
• enum/QmuAnalysisEnum.m (modified) (1 diff)
• enum/QmuErrNameEnum.m (modified) (1 diff)
• enum/QmuInNameEnum.m (modified) (1 diff)
• enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
• enum/QmuNPartEnum.m (modified) (1 diff)
• enum/QmuOutNameEnum.m (modified) (1 diff)
• enum/QmuPartEnum.m (modified) (1 diff)
• enum/QmuPressureEnum.m (modified) (1 diff)
• enum/QmuVxEnum.m (modified) (1 diff)
• enum/QmuVyEnum.m (modified) (1 diff)
• enum/QmuVzEnum.m (modified) (1 diff)
• enum/RelativeEnum.m (modified) (1 diff)
• enum/ResetPenaltiesEnum.m (modified) (1 diff)
• enum/ResidualEnum.m (modified) (1 diff)
• enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• enum/RheologyB2dEnum.m (modified) (1 diff)
• enum/RheologyBEnum.m (modified) (1 diff)
• enum/RheologyNEnum.m (modified) (1 diff)
• enum/RhoIceEnum.m (modified) (1 diff)
• enum/RhoWaterEnum.m (modified) (1 diff)
• enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
• enum/SeparateEnum.m (modified) (1 diff)
• enum/SolverStringEnum.m (modified) (1 diff)
• enum/SparsityEnum.m (modified) (1 diff)
• enum/StabilizeConstraintsEnum.m (modified) (1 diff)
• enum/StokesReconditioningEnum.m (modified) (1 diff)
• enum/StringExternalResultEnum.m (modified) (1 diff)
• enum/StringToEnum.m (modified) (3 diffs)
• enum/SurfaceAreaEnum.m (modified) (1 diff)
• enum/SurfaceEnum.m (modified) (1 diff)
• enum/SurfaceSlopeXEnum.m (modified) (1 diff)
• enum/SurfaceSlopeYEnum.m (modified) (1 diff)
• enum/TemperatureEnum.m (modified) (1 diff)
• enum/TemperatureOldEnum.m (modified) (1 diff)
• enum/ThermalConductivityEnum.m (modified) (1 diff)
• enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• enum/ThicknessEnum.m (modified) (1 diff)
• enum/ThicknessObsEnum.m (modified) (1 diff)
• enum/TimeEnum.m (modified) (1 diff)
• enum/TolXEnum.m (modified) (1 diff)
• enum/TriaVertexElementResultEnum.m (modified) (1 diff)
• enum/TypeEnum.m (modified) (1 diff)
• enum/VariableDescriptorsEnum.m (modified) (1 diff)
• enum/VelEnum.m (modified) (1 diff)
• enum/VelObsEnum.m (modified) (1 diff)
• enum/VerboseEnum.m (modified) (1 diff)
• enum/ViscosityOvershootEnum.m (modified) (1 diff)
• enum/VxAverageEnum.m (modified) (1 diff)
• enum/VxEnum.m (modified) (1 diff)
• enum/VxObsEnum.m (modified) (1 diff)
• enum/VxOldEnum.m (modified) (1 diff)
• enum/VyAverageEnum.m (modified) (1 diff)
• enum/VyEnum.m (modified) (1 diff)
• enum/VyObsEnum.m (modified) (1 diff)
• enum/VyOldEnum.m (modified) (1 diff)
• enum/VzAverageEnum.m (modified) (1 diff)
• enum/VzEnum.m (modified) (1 diff)
• enum/VzObsEnum.m (modified) (1 diff)
• enum/VzOldEnum.m (modified) (1 diff)
• enum/WaitOnLockEnum.m (modified) (1 diff)
• enum/WeightsEnum.m (modified) (1 diff)
• enum/YtsEnum.m (modified) (1 diff)
• solutions/control_core.m (modified) (3 diffs)
• solutions/controlconvergence.m (modified) (1 diff)
• solutions/objectivefunctionC.m (modified) (2 diffs)

issm/trunk/src/m/classes/@model/model.m

@@ -198 +198 @@
         md.nsteps=0;
         md.maxiter=[];
-        md.fit=[];
+        md.cm_responses=[];
         md.tolx=0;
         md.optscal=[];

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -183 +183 @@
 md.optscal=50*ones(md.nsteps,1);
 
-%several misfits can be used:
-%0 = absolute misfit
-%1 = relative misfit
-%2 = logarithmic misfit
-md.fit=0*ones(md.nsteps,1);
+%several responses can be used:
+md.cm_responses=SurfaceAbsVelMisfitEnum*ones(md.nsteps,1);
 
 %cm_jump is used to speed up control method. When

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -351 +351 @@
 
         %LENGTH CONTROL FIELDS
-        fields={'maxiter','optscal','fit','cm_jump'};
+        fields={'maxiter','optscal','cm_responses','cm_jump'};
         checksize(md,fields,[md.nsteps 1]);
 
-        %FIT
-        checkvalues(md,{'fit'},[0 1 2 3 4]);
+        %RESPONSES
+        checkvalues(md,{'cm_responses'},[SurfaceAbsVelMisfitEnum SurfaceRelVelMisfitEnum SurfaceLogVelMisfitEnum SurfaceLogVxVyMisfitEnum SurfaceAverageVelMisfitEnum]);
 
         %WEIGHTS

issm/trunk/src/m/classes/public/marshall.m

@@ -103 +103 @@
 
 %Write solution parameters
-WriteData(fid,md.fit,'Mat','fit');
+WriteData(fid,md.cm_responses,'Mat','cm_responses');
 WriteData(fid,md.weights,'Mat','weights');
 WriteData(fid,md.cm_jump,'Mat','cm_jump');

issm/trunk/src/m/enum/AbsoluteEnum.m

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=227;
+macro=233;

issm/trunk/src/m/enum/AdjointEnum.m

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=242;
+macro=248;

issm/trunk/src/m/enum/BetaEnum.m

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=237;
+macro=243;

issm/trunk/src/m/enum/BoolExternalResultEnum.m

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=212;
+macro=218;

issm/trunk/src/m/enum/CmGradientEnum.m

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=238;
+macro=244;

issm/trunk/src/m/enum/CmJumpEnum.m

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=239;
+macro=245;

issm/trunk/src/m/enum/CmMaxDmpSlopeEnum.m

@@ -9 +9 @@
 %      macro=CmMaxDmpSlopeEnum()
 
-macro=128;
+macro=130;

issm/trunk/src/m/enum/CmMaxDmpValueEnum.m

@@ -9 +9 @@
 %      macro=CmMaxDmpValueEnum()
 
-macro=129;
+macro=131;

issm/trunk/src/m/enum/CmMaxEnum.m

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=240;
+macro=246;

issm/trunk/src/m/enum/CmMinDmpSlopeEnum.m

@@ -9 +9 @@
 %      macro=CmMinDmpSlopeEnum()
 
-macro=130;
+macro=132;

issm/trunk/src/m/enum/CmMinDmpValueEnum.m

@@ -9 +9 @@
 %      macro=CmMinDmpValueEnum()
 
-macro=131;
+macro=133;

issm/trunk/src/m/enum/CmMinEnum.m

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=241;
+macro=247;

issm/trunk/src/m/enum/CmNoiseDmpEnum.m

@@ -9 +9 @@
 %      macro=CmNoiseDmpEnum()
 
-macro=132;
+macro=134;

issm/trunk/src/m/enum/ColinearEnum.m

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=235;
+macro=241;

issm/trunk/src/m/enum/ConnectivityEnum.m

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=245;
+macro=251;

issm/trunk/src/m/enum/ConstantEnum.m

@@ -9 +9 @@
 %      macro=ConstantEnum()
 
-macro=133;
+macro=135;

issm/trunk/src/m/enum/ControlParameterEnum.m

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=246;
+macro=252;

issm/trunk/src/m/enum/ControlSteadyEnum.m

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=247;
+macro=253;

issm/trunk/src/m/enum/ControlTypeEnum.m

@@ -9 +9 @@
 %      macro=ControlTypeEnum()
 
-macro=134;
+macro=136;

issm/trunk/src/m/enum/ConvergedEnum.m

@@ -9 +9 @@
 %      macro=ConvergedEnum()
 
-macro=135;
+macro=137;

issm/trunk/src/m/enum/DakotaParameterEnum.m

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=248;
+macro=254;

issm/trunk/src/m/enum/DhDtEnum.m

@@ -9 +9 @@
 %      macro=DhDtEnum()
 
-macro=136;
+macro=138;

issm/trunk/src/m/enum/DimEnum.m

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=249;
+macro=255;

issm/trunk/src/m/enum/DoubleElementResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=209;
+macro=215;

issm/trunk/src/m/enum/DoubleExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=213;
+macro=219;

issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=215;
+macro=221;

issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=214;
+macro=220;

issm/trunk/src/m/enum/DragCoefficientEnum.m

@@ -9 +9 @@
 %      macro=DragCoefficientEnum()
 
-macro=137;
+macro=139;

issm/trunk/src/m/enum/DragPEnum.m

@@ -9 +9 @@
 %      macro=DragPEnum()
 
-macro=138;
+macro=140;

issm/trunk/src/m/enum/DragQEnum.m

@@ -9 +9 @@
 %      macro=DragQEnum()
 
-macro=139;
+macro=141;

issm/trunk/src/m/enum/DragTypeEnum.m

@@ -9 +9 @@
 %      macro=DragTypeEnum()
 
-macro=140;
+macro=142;

issm/trunk/src/m/enum/DtEnum.m

@@ -9 +9 @@
 %      macro=DtEnum()
 
-macro=141;
+macro=143;

issm/trunk/src/m/enum/ElementOnBedEnum.m

@@ -9 +9 @@
 %      macro=ElementOnBedEnum()
 
-macro=142;
+macro=144;

issm/trunk/src/m/enum/ElementOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=ElementOnIceShelfEnum()
 
-macro=143;
+macro=145;

issm/trunk/src/m/enum/ElementOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=ElementOnSurfaceEnum()
 
-macro=144;
+macro=146;

issm/trunk/src/m/enum/ElementOnWaterEnum.m

@@ -9 +9 @@
 %      macro=ElementOnWaterEnum()
 
-macro=145;
+macro=147;

issm/trunk/src/m/enum/EnumToString.m

@@ -139 +139 @@
 case BedSlopeYEnum(), string='BedSlopeY'; return
 case BoundaryEnum(), string='Boundary'; return
+case CmResponseEnum(), string='CmResponse'; return
+case CmResponsesEnum(), string='CmResponses'; return
 case CmMaxDmpSlopeEnum(), string='CmMaxDmpSlope'; return
 case CmMaxDmpValueEnum(), string='CmMaxDmpValue'; return
@@ -159 +161 @@
 case EpsVelEnum(), string='EpsVel'; return
 case FillEnum(), string='Fill'; return
-case FitEnum(), string='Fit'; return
 case FractionIncrementEnum(), string='FractionIncrement'; return
 case FrictionEnum(), string='Friction'; return
@@ -166 +167 @@
 case KflagEnum(), string='Kflag'; return
 case MassFluxEnum(), string='MassFlux'; return
+case SurfaceAbsVelMisfitEnum(), string='SurfaceAbsVelMisfit'; return
+case SurfaceRelVelMisfitEnum(), string='SurfaceRelVelMisfit'; return
+case SurfaceLogVelMisfitEnum(), string='SurfaceLogVelMisfit'; return
+case SurfaceLogVxVyMisfitEnum(), string='SurfaceLogVxVyMisfit'; return
+case SurfaceAverageVelMisfitEnum(), string='SurfaceAverageVelMisfit'; return
 case MaxPenetrationEnum(), string='MaxPenetration'; return
 case MeanVelEnum(), string='MeanVel'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=250;
+macro=256;

issm/trunk/src/m/enum/EpsCmEnum.m

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=251;
+macro=257;

issm/trunk/src/m/enum/EpsRelEnum.m

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=252;
+macro=258;

issm/trunk/src/m/enum/EpsResEnum.m

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=253;
+macro=259;

issm/trunk/src/m/enum/EpsVelEnum.m

@@ -9 +9 @@
 %      macro=EpsVelEnum()
 
-macro=146;
+macro=148;

issm/trunk/src/m/enum/FillEnum.m

@@ -9 +9 @@
 %      macro=FillEnum()
 
-macro=147;
+macro=149;

issm/trunk/src/m/enum/FractionIncrementEnum.m

@@ -9 +9 @@
 %      macro=FractionIncrementEnum()
 
-macro=149;
+macro=150;

issm/trunk/src/m/enum/FrictionEnum.m

@@ -9 +9 @@
 %      macro=FrictionEnum()
 
-macro=150;
+macro=151;

issm/trunk/src/m/enum/GeothermalFluxEnum.m

@@ -9 +9 @@
 %      macro=GeothermalFluxEnum()
 
-macro=151;
+macro=152;

issm/trunk/src/m/enum/GradientEnum.m

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=243;
+macro=249;

issm/trunk/src/m/enum/GravityEnum.m

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=230;
+macro=236;

issm/trunk/src/m/enum/HeatCapacityEnum.m

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=254;
+macro=260;

issm/trunk/src/m/enum/IntExternalResultEnum.m

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=216;
+macro=222;

issm/trunk/src/m/enum/InternalEnum.m

@@ -9 +9 @@
 %      macro=InternalEnum()
 
-macro=152;
+macro=153;

issm/trunk/src/m/enum/IntersectEnum.m

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=234;
+macro=240;

issm/trunk/src/m/enum/IsHutterEnum.m

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=255;
+macro=261;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=256;
+macro=262;

issm/trunk/src/m/enum/IsStokesEnum.m

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=257;
+macro=263;

issm/trunk/src/m/enum/JEnum.m

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=219;
+macro=225;

issm/trunk/src/m/enum/KflagEnum.m

@@ -9 +9 @@
 %      macro=KflagEnum()
 
-macro=153;
+macro=154;

issm/trunk/src/m/enum/LatentHeatEnum.m

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=258;
+macro=264;

issm/trunk/src/m/enum/LowmemEnum.m

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=259;
+macro=265;

issm/trunk/src/m/enum/MassFluxEnum.m

@@ -9 +9 @@
 %      macro=MassFluxEnum()
 
-macro=154;
+macro=155;

issm/trunk/src/m/enum/MaxIterEnum.m

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=260;
+macro=266;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=261;
+macro=267;

issm/trunk/src/m/enum/MaxPenetrationEnum.m

@@ -9 +9 @@
 %      macro=MaxPenetrationEnum()
 
-macro=155;
+macro=161;

issm/trunk/src/m/enum/MeanVelEnum.m

@@ -9 +9 @@
 %      macro=MeanVelEnum()
 
-macro=156;
+macro=162;

issm/trunk/src/m/enum/MeltingOffsetEnum.m

@@ -9 +9 @@
 %      macro=MeltingOffsetEnum()
 
-macro=157;
+macro=163;

issm/trunk/src/m/enum/MeltingPointEnum.m

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=262;
+macro=268;

issm/trunk/src/m/enum/MeltingRateEnum.m

@@ -9 +9 @@
 %      macro=MeltingRateEnum()
 
-macro=158;
+macro=164;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=263;
+macro=269;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=264;
+macro=270;

issm/trunk/src/m/enum/MiniEnum.m

@@ -9 +9 @@
 %      macro=MiniEnum()
 
-macro=208;
+macro=214;

issm/trunk/src/m/enum/MisfitEnum.m

@@ -9 +9 @@
 %      macro=MisfitEnum()
 
-macro=159;
+macro=165;

issm/trunk/src/m/enum/MixedLayerCapacityEnum.m

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=232;
+macro=238;

issm/trunk/src/m/enum/NStepsEnum.m

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=265;
+macro=271;

issm/trunk/src/m/enum/NdtEnum.m

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=266;
+macro=272;

issm/trunk/src/m/enum/NodeOnBedEnum.m

@@ -9 +9 @@
 %      macro=NodeOnBedEnum()
 
-macro=160;
+macro=166;

issm/trunk/src/m/enum/NodeOnIceSheetEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceSheetEnum()
 
-macro=161;
+macro=167;

issm/trunk/src/m/enum/NodeOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceShelfEnum()
 
-macro=162;
+macro=168;

issm/trunk/src/m/enum/NodeOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=NodeOnSurfaceEnum()
 
-macro=163;
+macro=169;

issm/trunk/src/m/enum/NumOutputEnum.m

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=267;
+macro=273;

issm/trunk/src/m/enum/NumRiftsEnum.m

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=268;
+macro=274;

issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m

@@ -9 +9 @@
 %      macro=NumberNodeToElementConnectivityEnum()
 
-macro=164;
+macro=170;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=269;
+macro=275;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=270;
+macro=276;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=271;
+macro=277;

issm/trunk/src/m/enum/OldGradientEnum.m

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=244;
+macro=250;

issm/trunk/src/m/enum/OptScalEnum.m

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=272;
+macro=278;

issm/trunk/src/m/enum/OutputFilePointerEnum.m

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=273;
+macro=279;

issm/trunk/src/m/enum/OutputFrequencyEnum.m

@@ -9 +9 @@
 %      macro=OutputFrequencyEnum()
 
-macro=224;
+macro=230;

issm/trunk/src/m/enum/P0Enum.m

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=205;
+macro=211;

issm/trunk/src/m/enum/P1DGEnum.m

@@ -9 +9 @@
 %      macro=P1DGEnum()
 
-macro=207;
+macro=213;

issm/trunk/src/m/enum/P1Enum.m

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=206;
+macro=212;

issm/trunk/src/m/enum/ParameterOutputEnum.m

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=274;
+macro=280;

issm/trunk/src/m/enum/PatchEnum.m

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=220;
+macro=226;

issm/trunk/src/m/enum/PatchNodesEnum.m

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=222;
+macro=228;

issm/trunk/src/m/enum/PatchVerticesEnum.m

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=221;
+macro=227;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=275;
+macro=281;

issm/trunk/src/m/enum/PenaltyOffsetEnum.m

@@ -9 +9 @@
 %      macro=PenaltyOffsetEnum()
 
-macro=165;
+macro=171;

issm/trunk/src/m/enum/PentaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=211;
+macro=217;

issm/trunk/src/m/enum/PetscVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=217;
+macro=223;

issm/trunk/src/m/enum/PflagEnum.m

@@ -9 +9 @@
 %      macro=PflagEnum()
 
-macro=166;
+macro=172;

issm/trunk/src/m/enum/PressureEnum.m

@@ -9 +9 @@
 %      macro=PressureEnum()
 
-macro=167;
+macro=173;

issm/trunk/src/m/enum/PressureOldEnum.m

@@ -9 +9 @@
 %      macro=PressureOldEnum()
 
-macro=168;
+macro=174;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=276;
+macro=282;

issm/trunk/src/m/enum/QmuErrNameEnum.m

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=277;
+macro=283;

issm/trunk/src/m/enum/QmuInNameEnum.m

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=278;
+macro=284;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=279;
+macro=285;

issm/trunk/src/m/enum/QmuNPartEnum.m

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=280;
+macro=286;

issm/trunk/src/m/enum/QmuOutNameEnum.m

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=281;
+macro=287;

issm/trunk/src/m/enum/QmuPartEnum.m

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=282;
+macro=288;

issm/trunk/src/m/enum/QmuPressureEnum.m

@@ -9 +9 @@
 %      macro=QmuPressureEnum()
 
-macro=169;
+macro=175;

issm/trunk/src/m/enum/QmuVxEnum.m

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=193;
+macro=199;

issm/trunk/src/m/enum/QmuVyEnum.m

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=198;
+macro=204;

issm/trunk/src/m/enum/QmuVzEnum.m

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=203;
+macro=209;

issm/trunk/src/m/enum/RelativeEnum.m

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=225;
+macro=231;

issm/trunk/src/m/enum/ResetPenaltiesEnum.m

@@ -9 +9 @@
 %      macro=ResetPenaltiesEnum()
 
-macro=170;
+macro=176;

issm/trunk/src/m/enum/ResidualEnum.m

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=226;
+macro=232;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=283;
+macro=289;

issm/trunk/src/m/enum/RheologyB2dEnum.m

@@ -9 +9 @@
 %      macro=RheologyB2dEnum()
 
-macro=172;
+macro=178;

issm/trunk/src/m/enum/RheologyBEnum.m

@@ -9 +9 @@
 %      macro=RheologyBEnum()
 
-macro=171;
+macro=177;

issm/trunk/src/m/enum/RheologyNEnum.m

@@ -9 +9 @@
 %      macro=RheologyNEnum()
 
-macro=173;
+macro=179;

issm/trunk/src/m/enum/RhoIceEnum.m

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=228;
+macro=234;

issm/trunk/src/m/enum/RhoWaterEnum.m

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=229;
+macro=235;

issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=SegmentOnIceShelfEnum()
 
-macro=174;
+macro=180;

issm/trunk/src/m/enum/SeparateEnum.m

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=236;
+macro=242;

issm/trunk/src/m/enum/SolverStringEnum.m

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=284;
+macro=290;

issm/trunk/src/m/enum/SparsityEnum.m

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=285;
+macro=291;

issm/trunk/src/m/enum/StabilizeConstraintsEnum.m

@@ -9 +9 @@
 %      macro=StabilizeConstraintsEnum()
 
-macro=175;
+macro=181;

issm/trunk/src/m/enum/StokesReconditioningEnum.m

@@ -9 +9 @@
 %      macro=StokesReconditioningEnum()
 
-macro=176;
+macro=182;

issm/trunk/src/m/enum/StringExternalResultEnum.m

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=218;
+macro=224;

issm/trunk/src/m/enum/StringToEnum.m

@@ -137 +137 @@
                         elseif (strcmpi(name,'BedSlopeY')), enum=BedSlopeYEnum(); return
                         elseif (strcmpi(name,'Boundary')), enum=BoundaryEnum(); return
+                        elseif (strcmpi(name,'CmResponse')), enum=CmResponseEnum(); return
+                        elseif (strcmpi(name,'CmResponses')), enum=CmResponsesEnum(); return
                         elseif (strcmpi(name,'CmMaxDmpSlope')), enum=CmMaxDmpSlopeEnum(); return
                         elseif (strcmpi(name,'CmMaxDmpValue')), enum=CmMaxDmpValueEnum(); return
@@ -157 +159 @@
                         elseif (strcmpi(name,'EpsVel')), enum=EpsVelEnum(); return
                         elseif (strcmpi(name,'Fill')), enum=FillEnum(); return
-                        elseif (strcmpi(name,'Fit')), enum=FitEnum(); return
                         elseif (strcmpi(name,'FractionIncrement')), enum=FractionIncrementEnum(); return
                         elseif (strcmpi(name,'Friction')), enum=FrictionEnum(); return
@@ -164 +165 @@
                         elseif (strcmpi(name,'Kflag')), enum=KflagEnum(); return
                         elseif (strcmpi(name,'MassFlux')), enum=MassFluxEnum(); return
+                        elseif (strcmpi(name,'SurfaceAbsVelMisfit')), enum=SurfaceAbsVelMisfitEnum(); return
+                        elseif (strcmpi(name,'SurfaceRelVelMisfit')), enum=SurfaceRelVelMisfitEnum(); return
+                        elseif (strcmpi(name,'SurfaceLogVelMisfit')), enum=SurfaceLogVelMisfitEnum(); return
+                        elseif (strcmpi(name,'SurfaceLogVxVyMisfit')), enum=SurfaceLogVxVyMisfitEnum(); return
+                        elseif (strcmpi(name,'SurfaceAverageVelMisfit')), enum=SurfaceAverageVelMisfitEnum(); return
                         elseif (strcmpi(name,'MaxPenetration')), enum=MaxPenetrationEnum(); return
                         elseif (strcmpi(name,'MeanVel')), enum=MeanVelEnum(); return

issm/trunk/src/m/enum/SurfaceAreaEnum.m

@@ -9 +9 @@
 %      macro=SurfaceAreaEnum()
 
-macro=177;
+macro=183;

issm/trunk/src/m/enum/SurfaceEnum.m

@@ -9 +9 @@
 %      macro=SurfaceEnum()
 
-macro=178;
+macro=184;

issm/trunk/src/m/enum/SurfaceSlopeXEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeXEnum()
 
-macro=179;
+macro=185;

issm/trunk/src/m/enum/SurfaceSlopeYEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeYEnum()
 
-macro=180;
+macro=186;

issm/trunk/src/m/enum/TemperatureEnum.m

@@ -9 +9 @@
 %      macro=TemperatureEnum()
 
-macro=181;
+macro=187;

issm/trunk/src/m/enum/TemperatureOldEnum.m

@@ -9 +9 @@
 %      macro=TemperatureOldEnum()
 
-macro=182;
+macro=188;

issm/trunk/src/m/enum/ThermalConductivityEnum.m

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=231;
+macro=237;

issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=233;
+macro=239;

issm/trunk/src/m/enum/ThicknessEnum.m

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=183;
+macro=189;

issm/trunk/src/m/enum/ThicknessObsEnum.m

@@ -9 +9 @@
 %      macro=ThicknessObsEnum()
 
-macro=184;
+macro=190;

issm/trunk/src/m/enum/TimeEnum.m

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=223;
+macro=229;

issm/trunk/src/m/enum/TolXEnum.m

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=286;
+macro=292;

issm/trunk/src/m/enum/TriaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=TriaVertexElementResultEnum()
 
-macro=210;
+macro=216;

issm/trunk/src/m/enum/TypeEnum.m

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=185;
+macro=191;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=287;
+macro=293;

issm/trunk/src/m/enum/VelEnum.m

@@ -9 +9 @@
 %      macro=VelEnum()
 
-macro=186;
+macro=192;

issm/trunk/src/m/enum/VelObsEnum.m

@@ -9 +9 @@
 %      macro=VelObsEnum()
 
-macro=187;
+macro=193;

issm/trunk/src/m/enum/VerboseEnum.m

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=288;
+macro=294;

issm/trunk/src/m/enum/ViscosityOvershootEnum.m

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=188;
+macro=194;

issm/trunk/src/m/enum/VxAverageEnum.m

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=189;
+macro=195;

issm/trunk/src/m/enum/VxEnum.m

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=190;
+macro=196;

issm/trunk/src/m/enum/VxObsEnum.m

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=191;
+macro=197;

issm/trunk/src/m/enum/VxOldEnum.m

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=192;
+macro=198;

issm/trunk/src/m/enum/VyAverageEnum.m

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=194;
+macro=200;

issm/trunk/src/m/enum/VyEnum.m

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=195;
+macro=201;

issm/trunk/src/m/enum/VyObsEnum.m

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=196;
+macro=202;

issm/trunk/src/m/enum/VyOldEnum.m

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=197;
+macro=203;

issm/trunk/src/m/enum/VzAverageEnum.m

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=199;
+macro=205;

issm/trunk/src/m/enum/VzEnum.m

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=200;
+macro=206;

issm/trunk/src/m/enum/VzObsEnum.m

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=201;
+macro=207;

issm/trunk/src/m/enum/VzOldEnum.m

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=202;
+macro=208;

issm/trunk/src/m/enum/WaitOnLockEnum.m

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=289;
+macro=295;

issm/trunk/src/m/enum/WeightsEnum.m

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=204;
+macro=210;

issm/trunk/src/m/enum/YtsEnum.m

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=290;
+macro=296;

issm/trunk/src/m/solutions/control_core.m

@@ -11 +11 @@
         control_type=femmodel.parameters.ControlType;
         solution_type=femmodel.parameters.SolutionType;
-        fit=femmodel.parameters.Fit;
+        responses=femmodel.parameters.CmResponses;
         optscal=femmodel.parameters.OptScal;
         maxiter=femmodel.parameters.MaxIter;
@@ -38 +38 @@
 
                 disp(sprintf('\n%s%s%s%s\n',['   control method step ' num2str(n) '/' num2str(femmodel.parameters.NSteps)]));
-                [femmodel.elements,femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,fit(n),FitEnum);
+                [femmodel.elements,femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responses(n),CmResponseEnum);
 
                 %In case we are running a steady state control method, compute new temperature field using new parameter distribution: 
@@ -63 +63 @@
 
                 %Has convergence been reached?
-                converged=controlconvergence(J,fit,eps_cm,n);
+                converged=controlconvergence(J,responses,eps_cm,n);
                 if converged,
                         break;

issm/trunk/src/m/solutions/controlconvergence.m

@@ -1 @@
-function convergence=controlconvergence(J,fit,eps_cm,n)
+function convergence=controlconvergence(J,responses,eps_cm,n)
 %CONTROLCONVERGENCE - determine the convergence of control_core solution
 %
 %   Usage:
-%       converged=controlconvergence(J,fit,eps_cm,n);
+%       converged=controlconvergence(J,responses,eps_cm,n);
 
         convergence=false;
         if ~isnan(eps_cm),
                 i=n-2;
-                %go through the previous misfits(starting from n-2)
+                %go through the previous responsess(starting from n-2)
                 while (i>=1),
-                        if (fit(i)==fit(n)),
+                        if (strcmp(responses(i),responses(n))),
                                 %convergence test only if we have the same misfits
                                 if ((J(i)-J(n))/J(n) <= eps_cm),

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -5 +5 @@
 %recover some parameters
 optscal=femmodel.parameters.OptScal(n);
-fit=femmodel.parameters.Fit(n);
+response=femmodel.parameters.CmResponses(n);
 control_type=femmodel.parameters.ControlType;
 analysis_type=femmodel.parameters.AnalysisType;
@@ -36 +36 @@
 
 %Compute misfit for this velocity field
-[femmodel.elements,femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices, femmodel.loads,femmodel.materials,femmodel.parameters,fit,FitEnum);
-J=CostFunction(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials, femmodel.parameters);
+J=CostFunction(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials, femmodel.parameters,response);