Changeset 12004 for issm/branches/trunk-jpl-damage/src/m/classes/model/model.m

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/m/classes/model/model.m (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/m/classes/model/model.m

@@ -73 +73 @@
                          end
                  end% }}}
-                 function temp = template() % {{{
-
-                         %Get default fields
-                         md=model(0);
-                         modelprops=properties('model');
-
-                         %build output
-                         temp=struct();
-                         for i=1:length(modelprops),
-                                 temp.(modelprops{i})=md.(modelprops{i});
-                         end
-
-                 end% }}}
          end
          methods
@@ -93 +80 @@
                                  case 0
                                          md=setdefaultparameters(md);
-                                 case 1
-                                         in=varargin{1};
-                                         if (isa(in,'model'))
-                                                 %If single argument of class model, we have a copy constructor. 
-                                                 md = in;
-                                         elseif (isa(in,'numeric') & in==0)
-                                                 %requesting template
-                                                 %FIXME: for now recursive call
-                                                 md2=model;
-                                                 modelprops=properties('model');
-                                                 for i=1:length(modelprops);
-                                                         fieldname=modelprops{i};
-                                                         if md.(fieldname).marshall & isobject(md2.(fieldname)) & isempty(md.(fieldname).preprocess),
-                                                                 eval(['md.' fieldname '=' fieldname '(0);']);
-                                                         end
-                                                 end
-                                         else
-                                                 error('model constructor error message: unknown constructor for ''model'' class object');
-                                         end 
-
                                  otherwise
                                          error('model constructor error message: 0 of 1 argument only in input.');