source: issm/oecreview/Archive/12678-13393/ISSM-13147-13148.diff@ 13394

Last change on this file since 13394 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393

File size: 2.9 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/inversion.m
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/inversion.m (revision 13147)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/inversion.m (revision 13148)
5@@ -82,19 +82,19 @@
6 num_controls=numel(md.inversion.control_parameters);
7 num_costfunc=size(md.inversion.cost_functions,2);
8
9- checkfield(md,'inversion.iscontrol','values',[0 1]);
10- checkfield(md,'inversion.tao','values',[0 1]);
11- checkfield(md,'inversion.incomplete_adjoint','values',[0 1]);
12- checkfield(md,'inversion.control_parameters','cell',1,'values',{'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsRheologyZbar' 'Vx' 'Vy'});
13- checkfield(md,'inversion.nsteps','numel',1,'>=',1);
14- checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
15- checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]);
16- checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps num_costfunc],'values',[101:105 201 501:503]);
17- checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
18- checkfield(md,'inversion.gradient_only','values',[0 1]);
19- checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
20- checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
21- checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
22+ md = checkfield(md,'inversion.iscontrol','values',[0 1]);
23+ md = checkfield(md,'inversion.tao','values',[0 1]);
24+ md = checkfield(md,'inversion.incomplete_adjoint','values',[0 1]);
25+ md = checkfield(md,'inversion.control_parameters','cell',1,'values',{'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'MaterialsRheologyZbar' 'Vx' 'Vy'});
26+ md = checkfield(md,'inversion.nsteps','numel',1,'>=',1);
27+ md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
28+ md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]);
29+ md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps num_costfunc],'values',[101:105 201 501:505]);
30+ md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
31+ md = checkfield(md,'inversion.gradient_only','values',[0 1]);
32+ md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
33+ md = checkfield(md,'inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
34+ md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
35
36 if solution==BalancethicknessSolutionEnum()
37 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
Note: See TracBrowser for help on using the repository browser.