Changeset 2120

Timestamp:

09/08/09 11:50:59 (15 years ago)

Author:

jschierm

Message:

Addition of rest of interface parameters.

Location:

issm/trunk/src/m/solutions/dakota

Files:

• dakota_in_params.m (modified) (7 diffs)
• dakota_in_write.m (modified) (4 diffs)

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

@@ -56 +56 @@
     params.tabular_graphics_data=false;
 end
-% could use unique file name rather than dakota default
+% could use unique file name rather than 'dakota_tabular.dat'
 if ~isfield(params,'tabular_graphics_file')
     params.tabular_graphics_file=false;
@@ -70 +70 @@
 end
 
-if ~isfield(params,'output')
-    params.output='normal';
-end
-
-
 %%  model section
 
@@ -88 +83 @@
     params.direct=false;
 end
+
+%  interface parallelism controls
+
 if ~isfield(params,'asynchronous')
     params.asynchronous=true;
@@ -94 +92 @@
     params.evaluation_concurrency=false;
 end
+if ~isfield(params,'analysis_concurrency')
+    params.analysis_concurrency=false;
+end
+if ~isfield(params,'evaluation_servers')
+    params.evaluation_servers=false;
+end
+if ~isfield(params,'evaluation_self_scheduling')
+    params.evaluation_self_scheduling=false;
+end
+if ~isfield(params,'evaluation_static_scheduling')
+    params.evaluation_static_scheduling=false;
+end
+if ~isfield(params,'analysis_servers')
+    params.analysis_servers=false;
+end
+if ~isfield(params,'analysis_self_scheduling')
+    params.analysis_self_scheduling=false;
+end
+if ~isfield(params,'analysis_static_scheduling')
+    params.analysis_static_scheduling=false;
+end
+
+%  algebraic mappings
+
+if ~isfield(params,'algebraic_mappings')
+    params.algebraic_mappings=false;
+end
+
+%  simulation interface controls
+
 if ~isfield(params,'analysis_driver')
     params.analysis_driver='';
@@ -110 +138 @@
 end
 if ~isfield(params,'deactivate')
-    params.deactivate='evaluation_cache restart_file';
-end
-
+    params.deactivate='evaluation_cache,restart_file';
+end
+
+%  system call or fork interface
 
 if ~isfield(params,'parameters_file')
@@ -120 +149 @@
     params.results_file='results.out';
 end
+if ~isfield(params,'verbatim')
+    params.verbatim=false;
+end
+if ~isfield(params,'aprepro')
+    params.aprepro=false;
+end
 if ~isfield(params,'file_tag')
     params.file_tag=true;
@@ -125 +160 @@
 if ~isfield(params,'file_save')
     params.file_save=true;
+end
+
+%  direct function interface
+
+if ~isfield(params,'processors_per_analysis')
+    params.processors_per_analysis=false;
 end
 

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

@@ -84 +84 @@
 
 method_write(fidi,dmeth,dresp,params);
-param_write(fidi,'\t  ','output','   ','\n',params);
 
 %  write the model section
@@ -378 +377 @@
     param_write(fidi,'\t','asynchronous','','\n',params);
     param_write(fidi,'\t  ','evaluation_concurrency',' = ','\n',params);
+    param_write(fidi,'\t  ','analysis_concurrency','   = ','\n',params);
+    param_write(fidi,'\t  ','evaluation_servers','     = ','\n',params);
+    param_write(fidi,'\t  ','evaluation_self_scheduling','','\n',params);
+    param_write(fidi,'\t  ','evaluation_static_scheduling','','\n',params);
+    param_write(fidi,'\t  ','analysis_servers','       = ','\n',params);
+    param_write(fidi,'\t  ','analysis_self_scheduling','','\n',params);
+    param_write(fidi,'\t  ','analysis_static_scheduling','','\n',params);
+    param_write(fidi,'\t','algebraic_mappings',' = ','\n',params);
     param_write(fidi,'\t','system','','\n',params);
     param_write(fidi,'\t','fork','','\n',params);
@@ -388 +395 @@
     end
     param_write(fidi,'\t  ','failure_capture','   ','\n',params);
+    param_write(fidi,'\t  ','deactivate','        ','\n',params);
     param_write(fidi,'\t  ','parameters_file',' = ''','''\n',params);
     param_write(fidi,'\t  ','results_file','    = ''','''\n',params);
+    param_write(fidi,'\t  ','verbatim', '','\n',params);
+    param_write(fidi,'\t  ','aprepro', '','\n',params);
     param_write(fidi,'\t  ','file_tag', '','\n',params);
     param_write(fidi,'\t  ','file_save','','\n',params);
 elseif params.direct
 %  Error: asynchronous capability not yet supported 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);
@@ -409 +420 @@
     end
     param_write(fidi,'\t  ','failure_capture','   ','\n',params);
-    param_write(fidi,'\t  ','deactivate','   ','\n',params);
+    param_write(fidi,'\t  ','deactivate','        ','\n',params);
+    param_write(fidi,'\t  ','processors_per_analysis',' = ''','''\n',params);
 end