Changeset 349

Timestamp:

05/12/09 10:40:01 (16 years ago)

Author:

jschierm

Message:

Fixes for Matlab direct solver in Dakota.

Location:

issm/trunk/src/m/solutions/dakota

Files:

• dakota_in_data.m (modified) (1 diff)
• dakota_in_params.m (modified) (1 diff)
• dakota_in_write.m (modified) (1 diff)
• qmu.m (modified) (1 diff)

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

@@ -29 +29 @@
     end
     params.(fnames{i})=dparams.(fnames{i});
+end
+
+if params.direct && ...
+   isempty(params.analysis_driver)
+    params.analysis_driver='matlab';
 end
 

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

@@ -51 +51 @@
 if ~isfield(params,'direct')
     params.direct=false;
-end
-if ~params.system && ~params.fork && ~params.direct
-    params.fork=true;
 end
 if ~isfield(params,'asynchronous')

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

@@ -332 +332 @@
 fprintf(fidi,'interface,\n');
 
-if (params.system+params.fork+params.direct ~= 1)
-    error('Too few or too many interfaces selected.')
+if     ~params.system && ~params.fork && ~params.direct
+    params.fork=true;
+elseif (params.system+params.fork+params.direct > 1)
+    error('Too many interfaces selected.')
 end
 

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

@@ -50 +50 @@
 
 %create m and in files for dakota
-if ~isfield(md.qmu_params(iparams),'analysis_driver') || ...
-    isempty(md.qmu_params(iparams).analysis_driver)
+if (~isfield(md.qmu_params(iparams),'direct') || ...
+    ~md.qmu_params(iparams).direct) && ...
+   (~isfield(md.qmu_params(iparams),'analysis_driver') || ...
+    isempty(md.qmu_params(iparams).analysis_driver))
     md.qmu_params(iparams).analysis_driver=[ISSM_DIR '/src/m/solutions/dakota/cielo_ice_script.sh'];
 end