source: issm/oecreview/Archive/19101-20495/ISSM-19655-19656.diff

Index: ../trunk-jpl/src/m/qmu/dakota_in_write.m
===================================================================
--- ../trunk-jpl/src/m/qmu/dakota_in_write.m    (revision 19655)
+++ ../trunk-jpl/src/m/qmu/dakota_in_write.m    (revision 19656)
@@ -82,7 +82,9 @@
 
 %  write the strategy section
 
-strategy_write(fidi,params);
+if IssmConfig('_DAKOTA_VERSION_') < 6,
+       strategy_write(fidi,params);
+end
 
 %  write the method section
 
@@ -228,10 +230,16 @@
     param_write(fidi,'\t  ','file_save','','\n',params);
 elseif params.direct
 %  Error: asynchronous capability not yet supported in direct interfaces.
+%  Update: it is now possible to run in parallel in direct interfaces.
     param_write(fidi,'\t','algebraic_mappings',' = ','\n',params);
     param_write(fidi,'\t','direct','','\n',params);
     param_write(fidi,'\t  ','analysis_driver','     = ''','''\n',params);
-    param_write(fidi,'\t  ','evaluation_static_scheduling','','\n',params);
+    if IssmConfig('_DAKOTA_VERSION_') < 6,
+               param_write(fidi,'\t  ','evaluation_static_scheduling','','\n',params);
+       else
+               param_write(fidi,'\t  ','evaluation_scheduling',' ','\n',params);
+               param_write(fidi,'\t  ','processors_per_evaluation',' = ','\n',params);
+       end
     if ~isempty(params.analysis_components)
         [pathstr,name,ext] = fileparts(params.analysis_components);
         if isempty(ext)