Changeset 19656

Timestamp:

10/19/15 12:56:37 (9 years ago)

Author:

Eric.Larour

Message:

CHG: branch on dakota version to write the params section.

File:

• issm/trunk-jpl/src/m/qmu/dakota_in_write.m (modified) (2 diffs)

issm/trunk-jpl/src/m/qmu/dakota_in_write.m

@@ -83 +83 @@
 %  write the strategy section
 
-strategy_write(fidi,params);
+if IssmConfig('_DAKOTA_VERSION_') < 6,
+        strategy_write(fidi,params);
+end
 
 %  write the method section
@@ -229 +231 @@
 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);