Changeset 356

Timestamp:

05/12/09 12:19:04 (16 years ago)

Author:

Eric.Larour

Message:

dakot_m_write: direct matlab interface now runs with Dakota VOTD, ie: gets current number of the

function evaluation through fnEvalId field of Dakota structure.

qmu.m: commented out readfile for final dakota output files (too big most of the time)
qmuname: now takes md and a variable argument, which is the fnEvalId number. This way,

we handle the direct and indirect matlab interfaces transparently.

Location:

issm/trunk/src/m/solutions/dakota

Files:

• dakota_m_write.m (modified) (1 diff)
• qmu.m (modified) (1 diff)
• qmuname.m (modified) (1 diff)

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

@@ -89 +89 @@
 end
 fprintf(fidm,'\tloadmodel(infile);\n\n');
-% fprintf(fidm,'\tmd=qmuname(md);\n\n');
+
+if strcmpi(params.analysis_driver,'matlab')
+        fprintf(fidm,'\tmd=qmuname(md,Dakota.fnEvalId);\n\n');
+else
+        fprintf(fidm,'\tmd=qmuname(md);\n\n');
+end
 
 end

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

@@ -87 +87 @@
 
 %save input and output files into model
-md.dakotain =readfile([qmufile '.in']);
-md.dakotaout=readfile([qmufile '.out']);
-if exist('dakota_tabular.dat','file')
-        md.dakotadat=readfile('dakota_tabular.dat');
-end
+%md.dakotain =readfile([qmufile '.in']);
+%md.dakotaout=readfile([qmufile '.out']);
+%if exist('dakota_tabular.dat','file')
+%       md.dakotadat=readfile('dakota_tabular.dat');
+%end
 
 system('zip -mq params.in.zip params.in.[1-9]*');

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

@@ -1 @@
-function md=qmuname(md)
+function md=qmuname(md,varargin)
 %INPUT function md=qmuname(md)
-%Pick up the number file, read it and get the run number. Then modify the name of this 
+%Pick up the number from a file, or get it directly from the Dakota structure.  Then modify the name of this 
 %model to reflect this new number.
 
-fid=fopen('number','r');
-number=fscanf(fid,'%i',1)
-fclose(fid);
+if nargin==1,
+        fid=fopen('number','r');
+        number=fscanf(fid,'%i',1)
+        fclose(fid);
+else
+        number=varargin{1};
+end
 
 %modify model name by appending number to the name