Changeset 13059

Timestamp:

08/16/12 08:06:49 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: deconnecting cost_functions from Enums

Location:

issm/trunk-jpl/src/m/classes

Files:

• inversion.m (modified) (2 diffs)
• inversion.py (modified) (2 diffs)

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

@@ -90 +90 @@
                         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:503 377:378]);
+                        md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps num_costfunc],'values',[101:105 201 501:505]);
                         md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
                         md = checkfield(md,'inversion.gradient_only','values',[0 1]);
@@ -174 +174 @@
                         pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum();
                         pos=find(data==503); data(pos)=ThicknessAbsGradientEnum();
+                        pos=find(data==504); data(pos)=ThicknessAlongGradientEnum();
+                        pos=find(data==505); data(pos)=ThicknessAcrossGradientEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');

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

@@ -129 +129 @@
                 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,377,378])
+                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])
@@ -184 +184 @@
                 data[[i for i,item in enumerate(data) if item==502]]=RheologyBbarAbsGradientEnum()
                 data[[i for i,item in enumerate(data) if item==503]]=ThicknessAbsGradientEnum()
+                data[[i for i,item in enumerate(data) if item==504]]=ThicknessAlongGradientEnum()
+                data[[i for i,item in enumerate(data) if item==505]]=ThicknessAcrossGradientEnum()
                 WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3)
                 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer')