Changeset 2351

Timestamp:

09/29/09 11:32:28 (15 years ago)

Author:

jschierm

Message:

Update cdfs_read for later versions of dakota.

File:

• issm/trunk/src/m/solutions/dakota/dakota_out_parse.m (modified) (2 diffs)

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

@@ -375 +375 @@
 
     while ~isempty(fline)
-                if fline==-1,
-                        break
-                end
         [ntokens,tokens]=fltokens(fline);
 
@@ -406 +403 @@
         while ~isempty(fline) && ...
               ~strncmpi(fline,'Cumulative Distribution Function',32)
-                          if fline==-1,
-                                  break
-                          end
-                          [ntokens,tokens]=fltokens(fline);
+            [ntokens,tokens]=fltokens(fline);
             icdf=icdf+1;
-            dresp(idresp).cdf(icdf,1)=tokens{1}{ 1};
-            dresp(idresp).cdf(icdf,2)=tokens{1}{ 2};
-            if (ntokens == 4)
-                dresp(idresp).cdf(icdf,3)=tokens{1}{ 3};
-                dresp(idresp).cdf(icdf,4)=tokens{1}{ 4};
-            else
-                dresp(idresp).cdf(icdf,3)=NaN;
-                dresp(idresp).cdf(icdf,4)=NaN;
-            end
+            dresp(idresp).cdf(icdf,1:4)=NaN;
+%  in later versions of Dakota, uncalculated columns are now blank
+            itoken=0;
+            for i=1:length(fline)/19
+                if ~isempty(deblank(fline((i-1)*19+1:i*19)))
+                    itoken=itoken+1;
+                    dresp(idresp).cdf(icdf,i)=tokens{1}{itoken};
+                end
+            end;
             fline=fgetl(fidi);
         end