Changeset 2952

Timestamp:

02/03/10 23:16:51 (15 years ago)

Author:

Eric.Larour

Message:

Weirdest bug in solve.m, still don't understand it. Renamed md to model, so that
this routine does not modify the model md from which the list of models was extracted -> don't ask,
makes no sense.

loadmultipleresultsfromcluster: load list of results.

Location:

issm/trunk/src/m/classes/@modellist

Files:

• loadmultipleresultsfromcluster.m (added)
• solve.m (modified) (2 diffs)

issm/trunk/src/m/classes/@modellist/solve.m

@@ -37 +37 @@
 
         %model
-        md=mds.models{i};
+        mdex=mds.models{i};
         
         %recover some fields
-        md.analysis_type=options.analysis_type;
-        md.sub_analysis_type=options.sub_analysis_type;
+        mdex.analysis_type=options.analysis_type;
+        mdex.sub_analysis_type=options.sub_analysis_type;
 
-        md.name=[name '-' num2str(i) 'vs' num2str(nummodels)];
-        md.time=mds.time;
-        md.queue=mds.queue;
-        md.cluster=mds.cluster;
+        mdex.name=[name '-' num2str(i) 'vs' num2str(nummodels)];
+        mdex.time=mds.time;
+        mdex.queue=mds.queue;
+        mdex.cluster=mds.cluster;
         if ~isnan(mds.np),
-                md.np=mds.np;
+                mdex.np=mds.np;
         end
 
         %call solve in batch mode:
-        md=solve(md,varargin{:},'batch','yes','directory',name);
+        if strcmpi(cluster,oshostname),
+                mdex=solve(mdex,varargin{:});
+        else
+                mdex=solve(mdex,varargin{:},'batch','yes','directory',name);
+        end
 
         %feed back
-        mds.models{i}=md;
+        mds.models{i}=mdex;
 end
+
+%locally, we are done.
+if strcmpi(cluster,oshostname),
+        return
+end
+
 
 %now, tar all the files and then erase them.
@@ -72 +82 @@
 delete([name '.queue']);
 delete('ModelList.tar.gz');
+
+%save name: 
+mds.name=name;