Changeset 672

Timestamp:

06/01/09 13:47:11 (15 years ago)

Author:

Mathieu Morlighem

Message:

load results in md.solution

Location:

issm/trunk/src/m/classes/public

Files:

• loadresultsfromcluster.m (modified) (1 diff)
• loadresultsfromdisk.m (modified) (2 diffs)
• parseresultsfromdisk.m (modified) (1 diff)
• solveparallel.m (modified) (1 diff)

issm/trunk/src/m/classes/public/loadresultsfromcluster.m

@@ -34 +34 @@
 
 %erase the log and output files
-system(['rm -rf ' md.name '.outlog ' md.name '.errlog' md.name '.outbin']);
+system(['rm -rf ' md.name '.outlog ' md.name '.errlog ' md.name '.outbin ' md.name '.lock ']);
+%erase input files
+system(['rm -rf ' md.name '.bin ' md.name '.queue ']);

issm/trunk/src/m/classes/public/loadresultsfromdisk.m

@@ -5 +5 @@
 %      md=loadresultsfromdisk(md,filename);
 
-%We convert all results to m/a units, from m/s
-
+%check number of inputs/outputs
 if ((nargin~=2) | (nargout~=1)),
         help loadresultsfromdisk;
@@ -12 +11 @@
 end
 
-
-md.results=parseresultsfromdisk(filename);
+%load result onto model
+if isnan(md.results)
+        md.results=struct();
+end
+eval(['md.results.' md.analysis_type '=parseresultsfromdisk(filename);']);
 
 %Check result is consistent
 disp(sprintf('%s\n','checking result consistency'));
-
 if ~isresultconsistent(md),
-        disp('!! results not consistent correct the model !!') %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+        %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+        disp('!! results not consistent correct the model !!') 
 end

issm/trunk/src/m/classes/public/parseresultsfromdisk.m

@@ -14 +14 @@
 
 %Read fields until the end of the file.
-while 0<1,
+result=ReadData(fid);
+while ~isempty(result),
 
+        eval(['results(' num2str(result.step) ').' result.fieldname '=result.field;']);
+        eval(['results(' num2str(result.step) ').time=result.time;']);
+        eval(['results(' num2str(result.step) ').step=result.step;']);
         result=ReadData(fid);
-        if isempty(result),
-                break;
-        else
-                eval(['results(' num2str(result.step) ').' result.fieldname '=result.field;']);
-                eval(['results(' num2str(result.step) ').time=result.time;']);
-                eval(['results(' num2str(result.step) ').step=result.step;']);
-        end
+
 end

issm/trunk/src/m/classes/public/solveparallel.m

@@ -26 +26 @@
         %load results
         md=loadresultsfromcluster(md);
-else
-        return;
 end