Changeset 22710

Timestamp:

04/25/18 18:30:46 (7 years ago)

Author:

schlegel

Message:

CHG: update dakota parse to remove warnings

File:

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

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

@@ -79 +79 @@
         %%  loop through the file to find the Dakota method name
 
-        [fline]=findline(fidi,'methodName = ');
+        [fline]=findline(fidi,'method');
         if ~ischar(fline)
                 %do nothing
         else
                 % display(['  ' deblank(fline)]);
-
                 [ntokens,tokens]=fltokens(fline);
-                method=tokens{1}{3};
-                display(sprintf('Dakota methodName=''%s''.',method));
+                %dakota version >6
+                if strcmp(tokens{1}{1}(7),',')
+                        fline=fgetl(fidi);
+                        [ntokens,tokens]=fltokens(fline);
+                        method=tokens{1}{1};
+                        display(sprintf('Dakota method =''%s''.',method));
+                elseif strcmp(tokens{1}{1}(7),'N')
+                        [fline]=findline(fidi,'methodName = ');
+                        [ntokens,tokens]=fltokens(fline);
+                        method=tokens{1}{3};
+                        display(sprintf('Dakota methodName=''%s''.',method));
+                end
         end
 
@@ -141 +150 @@
                         [method]=itcomp_read(fidi,fline);
                 elseif strncmp(fline,'-----',5)
+                elseif strncmp(fline,'<<<<< Environment execution completed',37)
+                        break;
                 else
                         display(['Unexpected line: ' deblank(fline)]);