Changeset 12648

Timestamp:

07/18/12 10:23:24 (13 years ago)

Author:

Mathieu Morlighem

Message:

can now save and load matlab objects that are not structures

File:

• issm/trunk-jpl/src/m/classes/organizer.m (modified) (3 diffs)

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

@@ -69 +69 @@
                  end
                  %}}}
+                 function md=load(org,string),% {{{
+
+                         %Get model path
+                         if ~ischar(string), error('argument provided is not a string'); end
+                         path=[org.repository '/' org.prefix string];
+
+                         %figure out if the model is there
+                         if exist(path,'file'),
+                                 struc=load(path,'-mat');
+                                 name=char(fieldnames(struc));
+                                 md=struc.(name);
+                                 if nargout,
+                                         varargout{1}=md;
+                                 end
+                         else
+                                 error(['Could not find ' path ]);
+                         end
+                 end%}}}
                  function md=loadmodel(org,string),% {{{
 
@@ -76 +94 @@
 
                          %figure out if the model is there, otherwise, we have to use the default path supplied by user.
-                         if exist(path,'file'),
+                         if exist(path,'file') | exist([path '.mat'],'file'),
                                  md=loadmodel(path);
                                  return;
@@ -139 +157 @@
                          
                          %check that md is a model
-                         if ~isa(md,'model'),       error('savemodel error message: third argument is not a model'); end
+                         if ~isa(md,'model'), warning('third argument is not a model'); end
                          if (org.currentstep>length(org.steps)), error(['organizer error message: element with id ' num2str(org.currentstep) ' not found']); end