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

Timestamp:

01/07/15 08:48:32 (10 years ago)

Author:

Mathieu Morlighem

Message:

NEW: merging cost functions

File:

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

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

@@ -136 +136 @@
                         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:507 601:604]);
+                        md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',supportedcostfunctions());
                         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]);
@@ -227 +227 @@
                         %process cost functions
                         num_cost_functions=size(obj.cost_functions,2);
-                        data=obj.cost_functions;
-                        pos=find(obj.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum();
-                        pos=find(obj.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum();
-                        pos=find(obj.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum();
-                        pos=find(obj.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum();
-                        pos=find(obj.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum();
-                        pos=find(obj.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum();
-                        pos=find(obj.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum();
-                        pos=find(obj.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum();
-                        pos=find(obj.cost_functions==503); data(pos)=ThicknessAbsGradientEnum();
-                        pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
-                        pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
-                        pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
-                        pos=find(obj.cost_functions==507); data(pos)=RheologyBAbsGradientEnum();
-                        pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
+                        data=marshallcostfunctions(obj.cost_functions);
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');