Changeset 2116

Timestamp:

09/07/09 23:09:55 (16 years ago)

Author:

Eric.Larour

Message:

Took out graphics, graphics_data output from dakota.
Included optimized runs, without restarts, in dakota.

Location:

issm/trunk

Files:

• cron/configs/linux64_larour (added)
• src/m/solutions/dakota/dakota_in_params.m (modified) (3 diffs)
• src/m/solutions/dakota/dakota_in_write.m (modified) (2 diffs)
• test/Verification/IceSheetIceFrontM2dDakota_25/Square.par (modified) (1 diff)

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

@@ -54 +54 @@
 end
 if ~isfield(params,'tabular_graphics_data')
-    params.tabular_graphics_data=true;
+    params.tabular_graphics_data=false;
 end
 % could use unique file name rather than dakota default
 if ~isfield(params,'tabular_graphics_file')
-    params.tabular_graphics_file='dakota_tabular.dat';
+    params.tabular_graphics_file=false;
 end
 
@@ -69 +69 @@
     params.distribution='cumulative';
 end
+
+if ~isfield(params,'output')
+    params.output='normal';
+end
+
 
 %%  model section
@@ -104 +109 @@
     params.failure_capture='abort';
 end
+if ~isfield(params,'deactivate')
+    params.deactivate='evaluation_cache restart_file';
+end
+
+
 if ~isfield(params,'parameters_file')
     params.parameters_file='params.in';

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
@@ -408 +409 @@
     end
     param_write(fidi,'\t  ','failure_capture','   ','\n',params);
+    param_write(fidi,'\t  ','deactivate','   ','\n',params);
 end
 

issm/trunk/test/Verification/IceSheetIceFrontM2dDakota_25/Square.par

@@ -33 +33 @@
 
 %Parallel options
-md.np=3;
+md.np=8;
 md.time=50;
 md.waitonlock=1;