Changeset 965

Timestamp:

06/12/09 15:43:38 (16 years ago)

Author:

Eric.Larour

Message:

Some debugging for parallel qmu solution

Location:

issm/trunk/src/m

Files:

• classes/public/displayqmu.m (modified) (1 diff)
• classes/public/loadresultsfromdisk.m (modified) (1 diff)
• classes/public/solve.m (modified) (1 diff)
• classes/public/solveparallel.m (modified) (1 diff)
• solutions/dakota/qmumarshall.m (modified) (1 diff)

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

@@ -89 +89 @@
         if isempty(md.dakotadat), disp(sprintf('         dakotadat: N/A')); else disp(sprintf('         dakotadat:    [%ix%i]    (can be accessed by typing md.dakotadat)',size(md.dakotadat)));end
         disp(sprintf('         npart   : %i (number of partitions for semi-descrete qmu)',md.npart));
-        disp(sprintf('         dakotaplugin   : %i (are we running using the library mode for Dakota? defaults to 0',md.dakotaplugin));
 end

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

@@ -24 +24 @@
 end
 
-%deal with qmu results
-if md.qmu_analysis, 
-        md=qmuoutput(md,md.name,'qmu');
+%post processes qmu results if necessary
+if md.qmu_analysis,
+        md=postqmu(md);
+        cd ..
 end

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

@@ -48 +48 @@
 %sequences. 
 if ~strcmpi(md.cluster,'none'),
-        md=solveparallel(md);
+        md=solveparallel(md,options);
         return;
 end

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

@@ -1 @@
-function md=solveparallel(md)
+function md=solveparallel(md,options)
 %SOLVEPARALLEL - solution sequence using a cluster in parallel mode
 %

issm/trunk/src/m/solutions/dakota/qmumarshall.m

@@ -72 +72 @@
 WriteData(fid,md.npart,'Integer','npart');
 
-%write ivar and iresp to disk
-WriteData(fid,md.ivar,'Integer','ivar');
-WriteData(fid,md.iresp,'Integer','iresp');
-        
 %close file
 st=fclose(fid);