Changeset 22744

Timestamp:

05/07/18 13:12:44 (7 years ago)

Author:

erobo

Message:

CHG: add .m fields for adolc m1qn3

Location:

issm/trunk-jpl/src/m/classes

Files:

• autodiff.m (modified) (2 diffs)
• independent.m (modified) (4 diffs)

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

@@ -130 +130 @@
                                         names{i}=indep.name;
                                         types(i)=indep.typetoscalar();
-                                        min_parameters(:,i)=indep.min_parameters;
-                                        max_parameters(:,i)=indep.max_parameters;
+                                        min_parameters(:,:,i)=indep.min_parameters;
+                                        max_parameters(:,:,i)=indep.max_parameters;
                                         scaling_factors(i)=indep.control_scaling_factor;
+                                        control_sizes(i) = indep.control_size;
+
                                 end
                                 WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','StringArray');
@@ -138 +140 @@
                                 WriteData(fid,prefix,'data',min_parameters,'name','md.autodiff.independent_min_parameters','format','DoubleMat','mattype',3);
                  WriteData(fid,prefix,'data',max_parameters,'name','md.autodiff.independent_max_parameters','format','DoubleMat','mattype',3);
-                 WriteData(fid,prefix,'data',scaling_factors,'name','md.autodiff.independent_scaling_factors','format','DoubleMat','mattype',3);
-
+                 WriteData(fid,prefix,'data',scaling_factors,'name','md.autodiff.independent_scaling_factors','format','IntMat','mattype',3);
+                                WriteData(fid,prefix,'data',control_sizes,'name','md.autodiff.independent_control_sizes','format','IntMat','mattype',3);
 
                         end

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

@@ -6 +6 @@
 classdef independent
         properties (SetAccess=public) 
-                name                 = '';
-                type                 = '';
-                fos_forward_index    = NaN;
-                fov_forward_indices  = [];
-                nods                 = 0;
-                min_parameters                  = NaN;
-                max_parameters                  = NaN;
-                control_scaling_factor     = NaN
+                name                                   = '';
+                md_name                                                 = '';
+                type                                             = '';
+                fos_forward_index                          = NaN;
+                fov_forward_indices                     = [];
+                nods                                                            = 0;
+                min_parameters                                  = NaN;
+                max_parameters                                  = NaN;
+                control_scaling_factor     = NaN;
+                control_size                                    = 0;
+
         end
         methods
@@ -23 +26 @@
                         %OK get other fields
                         self=AssignObjectFields(pairoptions(varargin{:}),self);
+
 
                 end
@@ -53 +57 @@
 
                         end
+                end % }}}
 
-                end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   independent variable:'));
@@ -61 +65 @@
                         fielddisplay(self,'type','type of variable (''vertex'' or ''scalar'')');
                         fielddisplay(self,'nods','size of dependent variables');
+                        fielddisplay(self,'control_size','number of timesteps');
                         fielddisplay(self,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex');
                         fielddisplay(self,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex');