source: issm/oecreview/Archive/11025-11228/ISSM-11219-11220.diff@ 11232

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/flaim.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/flaim.m     (revision 11219)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/flaim.m     (revision 11220)
@@ -5,19 +5,19 @@
 
 classdef flaim
        properties (SetAccess=public) 
-               targets            = modelfield('default','','marshall',false);
-               tracks             = modelfield('default','','marshall',false);
-               flightreqs         = modelfield('default',struct(),'marshall',false);
-               criterion          = modelfield('default',NaN,'marshall',false);
-               gridsatequator     = modelfield('default',200000,'marshall',false);
-               usevalueordering   = modelfield('default',true,'marshall',false);
-               split_antimeridian = modelfield('default',true,'marshall',false);
-               solution           = modelfield('default','','marshall',false);
-               quality            = modelfield('default',0,'marshall',false);
-               path_optimize      = modelfield('default',false,'marshall',false);
-               opt_ndir           = modelfield('default',1,'marshall',false);
-               opt_dist           = modelfield('default',25,'marshall',false);
-               opt_niter          = modelfield('default',30000,'marshall',false);
+               targets            = ''
+               tracks             = ''
+               flightreqs         = struct()
+               criterion          = NaN
+               gridsatequator     = 200000
+               usevalueordering   = true
+               split_antimeridian = true
+               solution           = ''
+               quality            = 0
+               path_optimize      = false
+               opt_ndir           = 1
+               opt_dist           = 25
+               opt_niter          = 30000
        end
        methods
                function obj = flaim(varargin) % {{{
@@ -37,13 +37,6 @@
                end % }}}
                function obj = setdefaultparameters(obj) % {{{
 
-                       %first, use the defaults provided by the properties definition above. 
-                       fieldnames=fields(obj);
-                       for i=1:length(fieldnames),
-                               fieldname=fieldnames{i};
-                               obj.(fieldname)=obj.(fieldname).default;
-                       end
-
                end % }}}
                function checkconsistency(obj,md,solution,analyses) % {{{
 
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/radaroverlay.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/radaroverlay.m      (revision 11219)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/radaroverlay.m      (revision 11220)
@@ -5,9 +5,9 @@
 
 classdef radaroverlay
        properties (SetAccess=public) 
-               pwr = modelfield('default',NaN,'marshall',false);
-               x   = modelfield('default',NaN,'marshall',false);
-               y   = modelfield('default',NaN,'marshall',false);
+               pwr = NaN;
+               x   = NaN;
+               y   = NaN;
        end
        methods
                function obj = radaroverlay(varargin) % {{{
@@ -27,12 +27,6 @@
                end % }}}
                function obj = setdefaultparameters(obj) % {{{
 
-                       %first, use the defaults provided by the properties definition above. 
-                       fieldnames=fields(obj);
-                       for i=1:length(fieldnames),
-                               fieldname=fieldnames{i};
-                               obj.(fieldname)=obj.(fieldname).default;
-                       end
                end % }}}
                function disp(obj) % {{{
                        disp(sprintf('   radaroverlay parameters:'));
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/modelfield.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/modelfield.m  (revision 11219)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/modelfield.m  (revision 11220)
@@ -1,31 +0,0 @@
-%MODELFIELD class definition
-%
-%   Usage:
-%      modelfield(varargin)
-
-classdef modelfield
-       properties (SetAccess=public) 
-               marshall=false;
-               default=0;
-               preprocess='';
-               format='Int';
-               mattype=0;
-               parameters=false;
-               enum=NoneEnum;
-       end
-       methods
-               function mf = modelfield(varargin)
-
-                       options=pairoptions(varargin{:});
-                       for i=1:size(options.list,1),
-                               fieldname=options.list{i,1};
-                               fieldvalue=options.list{i,2};
-                               if ismember(fieldname,properties('modelfield')),
-                                               mf.(fieldname)=fieldvalue;
-                               else
-                                       disp(['''' fieldname ''' is not a property of modelfield']);
-                               end
-                       end
-               end
-       end
-end
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m (revision 11219)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m (revision 11220)
@@ -5,23 +5,23 @@
 
 classdef inversion
        properties (SetAccess=public) 
-               iscontrol                   = modelfield('default',0,'marshall',true,'format','Boolean');
-               control_parameters          = modelfield('default',NaN,'marshall',true,'preprocess','marshallcontroltype','format','DoubleMat','mattype',3);
-               nsteps                      = modelfield('default',0,'marshall',true,'format','Integer');
-               maxiter_per_step            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-               cost_functions              = modelfield('default',NaN,'marshall',true,'preprocess','marshallcmresponses','format','DoubleMat','mattype',3);
-               cost_functions_coefficients = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-               gradient_scaling            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-               cost_function_threshold     = modelfield('default',0,'marshall',true,'format','Double');
-               min_parameters              = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-               max_parameters              = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-               step_threshold              = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-               gradient_only               = modelfield('default',0,'marshall',true,'format','Boolean');
-               vx_obs                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-               vy_obs                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-               vz_obs                      = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-               vel_obs                     = modelfield('default',NaN,'marshall',false);
-               thickness_obs               = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
+               iscontrol                   = 0
+               control_parameters          = NaN
+               nsteps                      = 0
+               maxiter_per_step            = NaN
+               cost_functions              = NaN
+               cost_functions_coefficients = NaN
+               gradient_scaling            = NaN
+               cost_function_threshold     = 0
+               min_parameters              = NaN
+               max_parameters              = NaN
+               step_threshold              = NaN
+               gradient_only               = 0
+               vx_obs                      = NaN
+               vy_obs                      = NaN
+               vz_obs                      = NaN
+               vel_obs                     = NaN
+               thickness_obs               = NaN
        end
        methods
                function obj = inversion(varargin) % {{{
@@ -41,13 +41,6 @@
                end % }}}
                function obj = setdefaultparameters(obj) % {{{
 
-                       %first, use the defaults provided by the properties definition above. 
-                       fieldnames=fields(obj);
-                       for i=1:length(fieldnames),
-                               fieldname=fieldnames{i};
-                               obj.(fieldname)=obj.(fieldname).default;
-                       end
-
                         %parameter to be inferred by control methods (only
                         %drag and B are supported yet)
                         obj.control_parameters={'FrictionCoefficient'};