Changeset 19672

Timestamp:

10/21/15 15:42:04 (9 years ago)

Author:

schlegel

Message:

CHG: add option for new dakota read of dat file

File:

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

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

@@ -168 +168 @@
 
 [ntokens,tokens]=fltokens(fline);
-desc=cell (1,ntokens-1);
-data=zeros(1,ntokens-1);
-
-for i=1:ntokens-1
-    desc(1,i)=cellstr(tokens{1}{i+1});
-end
-display(sprintf('Number of columns (Dakota V+R)=%d.',ntokens-1));
+
+% New file DAKOTA versions>6
+if strncmpi(fline,'%eval_id interface',18)
+        offset=2;
+else %DAKOTA versions<6
+        offset=1;
+end
+desc=cell (1,ntokens-offset);
+data=zeros(1,ntokens-offset);
+
+for i=1:ntokens-offset
+    desc(1,i)=cellstr(tokens{1}{i+offset});
+end
+display(sprintf('Number of columns (Dakota V+R)=%d.',ntokens-2));
 
 %  process rows of matrix
@@ -189 +196 @@
 
     nrow=nrow+1;
-    for i=1:ntokens-1
-        data(nrow,i)=tokens{1}{i+1};
+    for i=1:ntokens-offset
+        data(nrow,i)=tokens{1}{i+offset};
     end
 end