Changeset 16249

Timestamp:

09/25/13 08:49:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed gradient_only option, use nsteps=0 instead

Location:

issm/trunk-jpl/src/m

Files:

• classes/inversion.m (modified) (6 diffs)
• classes/inversion.py (modified) (5 diffs)
• classes/taoinversion.m (modified) (1 diff)
• enum/EnumDefinitions.py (modified) (1 diff)
• enum/InversionGradientOnlyEnum.m (deleted)
• enum/ThermalIsdynamicbasalspcEnum.m (added)

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

@@ -19 +19 @@
                 max_parameters              = NaN
                 step_threshold              = NaN
-                gradient_only               = 0
                 vx_obs                      = NaN
                 vy_obs                      = NaN
@@ -50 +49 @@
                                                 obj.step_threshold              = .99*ones(in.nsteps,1);
                                                 obj.vx_obs                      = in.vx_obs;
-                                                obj.gradient_only               = 0;
                                                 obj.vy_obs                      = in.vy_obs;
                                                 obj.vz_obs                      = in.vz_obs;
@@ -95 +93 @@
                         obj.step_threshold=.7*ones(obj.nsteps,1); %30 per cent decrement.
 
-                        %stop control solution at the gradient computation and return it? 
-                        obj.gradient_only=0;
-
                         %cost_function_threshold is a criteria to stop the control methods.
                         %if J[n]-J[n-1]/J[n] < criteria, the control run stops
@@ -117 +112 @@
                         md = checkfield(md,'inversion.control_parameters','cell',1,'values',...
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness'});
-                        %md = checkfield(md,'inversion.nsteps','numel',1,'>=',1);
+                        md = checkfield(md,'inversion.nsteps','numel',1,'>=',0);
                         md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
                         md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]);
                         md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps num_costfunc],'values',[101:105 201 501:506]);
                         md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
-                        md = checkfield(md,'inversion.gradient_only','values',[0 1]);
                         md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
                         md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
@@ -157 +151 @@
                         fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex');
                         fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex');
-                        fielddisplay(obj,'gradient_only','stop control method solution at gradient');
                         fielddisplay(obj,'vx_obs','observed velocity x component [m/yr]');
                         fielddisplay(obj,'vy_obs','observed velocity y component [m/yr]');
@@ -189 +182 @@
                         WriteData(fid,'object',obj,'fieldname','max_parameters','format','DoubleMat','mattype',3);
                         WriteData(fid,'object',obj,'fieldname','step_threshold','format','DoubleMat','mattype',3);
-                        WriteData(fid,'object',obj,'fieldname','gradient_only','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts);
                         WriteData(fid,'object',obj,'fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts);

issm/trunk-jpl/src/m/classes/inversion.py

@@ -29 +29 @@
                 self.max_parameters              = float('NaN')
                 self.step_threshold              = float('NaN')
-                self.gradient_only               = 0
                 self.vx_obs                      = float('NaN')
                 self.vy_obs                      = float('NaN')
@@ -54 +53 @@
                 string="%s\n%s"%(string,fielddisplay(self,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex'))
                 string="%s\n%s"%(string,fielddisplay(self,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'))
-                string="%s\n%s"%(string,fielddisplay(self,'gradient_only','stop control method solution at gradient'))
                 string="%s\n%s"%(string,fielddisplay(self,'vx_obs','observed velocity x component [m/yr]'))
                 string="%s\n%s"%(string,fielddisplay(self,'vy_obs','observed velocity y component [m/yr]'))
@@ -102 +100 @@
                 self.step_threshold=.7*numpy.ones(self.nsteps) #30 per cent decrement
 
-                #stop control solution at the gradient computation and return it? 
-                self.gradient_only=0
-
                 #cost_function_threshold is a criteria to stop the control methods.
                 #if J[n]-J[n-1]/J[n] < criteria, the control run stops
@@ -125 +120 @@
                 md = checkfield(md,'inversion.incomplete_adjoint','values',[0,1])
                 md = checkfield(md,'inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy'])
-                md = checkfield(md,'inversion.nsteps','numel',[1],'>=',1)
+                md = checkfield(md,'inversion.nsteps','numel',[1],'>=',0)
                 md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0)
                 md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps])
                 md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps,num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
                 md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0)
-                md = checkfield(md,'inversion.gradient_only','values',[0,1])
                 md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps,num_controls])
                 md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices,num_controls])
@@ -165 +159 @@
                 WriteData(fid,'object',self,'fieldname','max_parameters','format','DoubleMat','mattype',3)
                 WriteData(fid,'object',self,'fieldname','step_threshold','format','DoubleMat','mattype',3)
-                WriteData(fid,'object',self,'fieldname','gradient_only','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts)
                 WriteData(fid,'object',self,'fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts)

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

@@ -75 +75 @@
                         md = checkfield(md,'inversion.control_parameters','cell',1,'values',...
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsRheologyZbar' 'Vx' 'Vy' 'Thickness'});
-                        %md = checkfield(md,'inversion.nsteps','numel',1,'>=',1);
+                        md = checkfield(md,'inversion.nsteps','numel',1,'>=',0);
                         md = checkfield(md,'inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]);
                         md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);

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

@@ -127 +127 @@
 def InversionCostFunctionsCoefficientsEnum(): return StringToEnum("InversionCostFunctionsCoefficients")[0]
 def InversionCostFunctionsEnum(): return StringToEnum("InversionCostFunctions")[0]
-def InversionGradientOnlyEnum(): return StringToEnum("InversionGradientOnly")[0]
 def InversionGradientScalingEnum(): return StringToEnum("InversionGradientScaling")[0]
 def InversionIscontrolEnum(): return StringToEnum("InversionIscontrol")[0]