Changeset 18615

Timestamp:

10/10/14 14:28:51 (10 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added scaling factor in M1QN3 to normalize gradient

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• m/classes/m1qn3inversion.m (modified) (6 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/InversionControlScalingFactorsEnum.m (added)

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -142 +142 @@
         IndependentObjectEnum,
         InversionControlParametersEnum,
+        InversionControlScalingFactorsEnum,
         InversionCostFunctionThresholdEnum,
         InversionCostFunctionsCoefficientsEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -150 +150 @@
                 case IndependentObjectEnum : return "IndependentObject";
                 case InversionControlParametersEnum : return "InversionControlParameters";
+                case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors";
                 case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold";
                 case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -153 +153 @@
               else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
               else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
+              else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
               else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
@@ -259 +260 @@
               else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
               else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
-              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
+              if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
+              else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
               else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
@@ -382 +383 @@
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
-              else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
+              if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
+              else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
               else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
               else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
-              else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum;
+              if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
+              else if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum;
               else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
               else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
@@ -628 +629 @@
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
-              else if (strcmp(name,"Step")==0) return StepEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Time")==0) return TimeEnum;
+              if (strcmp(name,"Step")==0) return StepEnum;
+              else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
@@ -751 +752 @@
               else if (strcmp(name,"BasalforcingsOceanTurningAngle")==0) return BasalforcingsOceanTurningAngleEnum;
               else if (strcmp(name,"BasalforcingsOceanSsh")==0) return BasalforcingsOceanSshEnum;
-              else if (strcmp(name,"BasalforcingsOceanVx")==0) return BasalforcingsOceanVxEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"BasalforcingsOceanVy")==0) return BasalforcingsOceanVyEnum;
+              if (strcmp(name,"BasalforcingsOceanVx")==0) return BasalforcingsOceanVxEnum;
+              else if (strcmp(name,"BasalforcingsOceanVy")==0) return BasalforcingsOceanVyEnum;
               else if (strcmp(name,"SurfaceforcingsRhoAir")==0) return SurfaceforcingsRhoAirEnum;
               else if (strcmp(name,"SurfaceforcingsAirCoef")==0) return SurfaceforcingsAirCoefEnum;

issm/trunk-jpl/src/m/classes/m1qn3inversion.m

@@ -9 +9 @@
                 incomplete_adjoint          = 0
                 control_parameters          = NaN
+                control_scaling_factors     = NaN
                 maxsteps                    = 0
                 maxiter                     = 0
-                dxmin                       = 0;
-                gttol                       = 0;
+                dxmin                       = 0
+                gttol                       = 0
                 cost_functions              = NaN
                 cost_functions_coefficients = NaN
@@ -22 +23 @@
                 vel_obs                     = NaN
                 thickness_obs               = NaN
-                surface_obs               = NaN
+                surface_obs                 = NaN
 
         end
@@ -44 +45 @@
                         %drag and B are supported yet)
                         self.control_parameters={'FrictionCoefficient'};
+
+                        %Scaling factor for each control
+                        self.control_scaling_factors=1;
 
                         %number of iterations
@@ -74 +78 @@
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar',...
                                 'Vx' 'Vy' 'Thickness' 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
+                        md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[1 num_controls],'>',0,'NaN',1);
                         md = checkfield(md,'fieldname','inversion.maxsteps','numel',1,'>=',0);
                         md = checkfield(md,'fieldname','inversion.maxiter','numel',1,'>=',0);
@@ -100 +105 @@
                         fielddisplay(obj,'incomplete_adjoint','1: linear viscosity, 0: non-linear viscosity');
                         fielddisplay(obj,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}');
+                        fielddisplay(obj,'control_scaling_factors','order of magnitude of each control (useful for multi-parameter optimization)');
                         fielddisplay(obj,'maxsteps','maximum number of iterations (gradient computation)');
                         fielddisplay(obj,'maxiter','maximum number of Function evaluation (forward run)');
@@ -132 +138 @@
                         if ~obj.iscontrol, return; end
                         WriteData(fid,'object',obj,'class','inversion','fieldname','incomplete_adjoint','format','Boolean');
+                        WriteData(fid,'object',obj,'class','inversion','fieldname','control_scaling_factors','format','DoubleMat','mattype',3);
                         WriteData(fid,'object',obj,'class','inversion','fieldname','maxsteps','format','Integer');
                         WriteData(fid,'object',obj,'class','inversion','fieldname','maxiter','format','Integer');

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -142 +142 @@
 def IndependentObjectEnum(): return StringToEnum("IndependentObject")[0]
 def InversionControlParametersEnum(): return StringToEnum("InversionControlParameters")[0]
+def InversionControlScalingFactorsEnum(): return StringToEnum("InversionControlScalingFactors")[0]
 def InversionCostFunctionThresholdEnum(): return StringToEnum("InversionCostFunctionThreshold")[0]
 def InversionCostFunctionsCoefficientsEnum(): return StringToEnum("InversionCostFunctionsCoefficients")[0]