Changeset 16764 for issm/trunk-jpl/src/m/classes/inversion.m

Timestamp:

11/14/13 14:50:13 (11 years ago)

Author:

Eric.Larour

Message:

CHG: checkfield could not run for massatfluggate or misfit classes, because these classes do not
have access to their own fields through the model! So we modified checkfield.m and checkfield.py to accept
either directly a field, or indirectly a fieldname which then is used to retrieve from the model.

File:

• issm/trunk-jpl/src/m/classes/inversion.m (modified) (2 diffs)

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

@@ -107 +107 @@
                         num_costfunc=size(md.inversion.cost_functions,2);
 
-                        md = checkfield(md,'inversion.iscontrol','values',[0 1]);
-                        md = checkfield(md,'inversion.tao','values',[0 1]);
-                        md = checkfield(md,'inversion.incomplete_adjoint','values',[0 1]);
-                        md = checkfield(md,'inversion.control_parameters','cell',1,'values',...
+                        md = checkfield(md,'fieldname','inversion.iscontrol','values',[0 1]);
+                        md = checkfield(md,'fieldname','inversion.tao','values',[0 1]);
+                        md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]);
+                        md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness'});
-                        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',[1 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_scaling','size',[md.inversion.nsteps num_controls]);
-                        md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
-                        md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
+                        md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0);
+                        md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
+                        md = checkfield(md,'fieldname','inversion.step_threshold','size',[md.inversion.nsteps 1]);
+                        md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]);
+                        md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
+                        md = checkfield(md,'fieldname','inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
+                        md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
+                        md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
 
                         %Only SSA, HO and FS are supported right now
@@ -129 +129 @@
 
                         if solution==BalancethicknessSolutionEnum()
-                                md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
+                                md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
                         elseif solution==BalancethicknessSoftSolutionEnum()
-                                md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
+                                md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
                         else
-                                md = checkfield(md,'inversion.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
-                                md = checkfield(md,'inversion.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
+                                md = checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
+                                md = checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
                         end
                 end % }}}