Changeset 10981 for issm/trunk/src/m/classes/inversion.m

Timestamp:

11/29/11 19:29:01 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 10980

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/m/classes/inversion.m (modified) (3 diffs)

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

@@ -18 +18 @@
                 step_threshold              = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
                 gradient_only               = modelfield('default',0,'marshall',true,'format','Boolean');
-                num_control_parameters      = modelfield('default',0,'marshall',true,'format','Integer');
-                num_cost_functions          = modelfield('default',0,'marshall',true,'format','Integer');
                 vx_obs                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                 vy_obs                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
@@ -126 +124 @@
                         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,'num_control_parameters','number of control_parameters');
-                        %fielddisplay(obj,'num_cost_functions','number of cost_functions');
                         fielddisplay(obj,'vx_obs','observed velocity x component [m/a]');
                         fielddisplay(obj,'vy_obs','observed velocity y component [m/a]');
@@ -143 +139 @@
                         disp('   503: ThicknessAbsGradient');
                 end % }}}
+                function marshall(obj,fid) % {{{
+
+                        WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean');
+                        if ~obj.iscontrol, return; end
+                        WriteData(fid,'object',obj,'fieldname','nsteps','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','maxiter_per_step','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','cost_functions_coefficients','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','gradient_scaling','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','cost_function_threshold','format','Double');
+                        WriteData(fid,'object',obj,'fieldname','min_parameters','format','DoubleMat','mattype',3);
+                        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);
+                        WriteData(fid,'object',obj,'fieldname','vy_obs','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','vz_obs','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','thickness_obs','format','DoubleMat','mattype',1);
+
+                        %process control parameters
+                        num_control_parameters=numel(obj.control_parameters);
+                        data=zeros(1,num_control_parameters);
+                        for i=1:num_control_parameters,
+                                data(i)=StringToEnum(obj.control_parameters{i});
+                        end
+                        WriteData(fid,'data',data,'enum',InversionControlParametersEnum,'format','DoubleMat','mattype',3);
+                        WriteData(fid,'data',num_control_parameters,'enum',InversionNumControlParametersEnum,'format','Integer');
+
+                        %process cost functions
+                        num_cost_functions=size(obj.cost_functions,2);
+                        data=obj.cost_functions;
+                        pos=find(data==101); data(pos)=SurfaceAbsVelMisfitEnum;
+                        pos=find(data==102); data(pos)=SurfaceRelVelMisfitEnum;
+                        pos=find(data==103); data(pos)=SurfaceLogVelMisfitEnum;
+                        pos=find(data==104); data(pos)=SurfaceLogVxVyMisfitEnum;
+                        pos=find(data==105); data(pos)=SurfaceAverageVelMisfitEnum;
+                        pos=find(data==201); data(pos)=ThicknessAbsMisfitEnum;
+                        pos=find(data==501); data(pos)=DragCoefficientAbsGradientEnum;
+                        pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum;
+                        pos=find(data==503); data(pos)=ThicknessAbsGradientEnum;
+                        WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum,'format','DoubleMat','mattype',3);
+                        WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum,'format','Integer');
+                end % }}}
         end
 end