Changeset 3564

Timestamp:

04/16/10 15:51:59 (15 years ago)

Author:

jschierm

Message:

QMU with Dakota: small bug fixes.

Location:

issm/trunk/src/m/solutions/dakota

Files:

• dakota_in_data.m (modified) (1 diff)
• dakota_out_parse.m (modified) (10 diffs)

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

@@ -133 +133 @@
 
 %Write in file
-dakota_in_write(dmeth.method,dmeth,dvar,dresp,params,filei,varargin{:});
+dakota_in_write(dmeth,dvar,dresp,params,filei,varargin{:});
 
 end

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

@@ -66 +66 @@
 fline=fgetl(fidi);
 if ~ischar(fline)
-    ieof=1;
     error('File ''%s'' is empty.',filei);
 end
@@ -366 +365 @@
 display('Reading CDF''s for response functions:');
 
-while ~isempty(fline)
+while ischar(fline) && ~isempty(fline)
     fline=fgetl(fidi);
     if ~ischar(fline)
@@ -374 +373 @@
 %  process header line of cdf
 
-    while ~isempty(fline)
+    while ischar(fline) && ~isempty(fline)
         [ntokens,tokens]=fltokens(fline);
 
@@ -401 +400 @@
         fline=fgetl(fidi);
         icdf=0;
-        while ~isempty(fline) && ...
+        while ischar(fline) && ~isempty(fline) && ...
               ~strncmpi(fline,'Cumulative Distribution Function',32)
             [ntokens,tokens]=fltokens(fline);
@@ -493 +492 @@
 end
 
-ieof=0;
 display('Reading MV statistics for response functions:');
 ndresp=0;
 
-while ~ieof && ~isempty(fline) && ...
+while ischar(fline) && ~isempty(fline) && ...
         strncmpi(fline,'MV Statistics for ',18)
 
@@ -517 +515 @@
     fline=fgetl(fidi);
     if ~ischar(fline)
-        ieof=1;
         break;
     end
 
-    while ~ieof && ~isempty(fline) && ...
+    while ischar(fline) && ~isempty(fline) && ...
             strncmpi(fline,'  Importance Factor for variable ',33)
         [ntokens,tokens]=fltokens(fline);
@@ -529 +526 @@
 
         fline=fgetl(fidi);
-        if ~ischar(fline)
-            ieof=1;
-            break;
-        end
     end
 
@@ -541 +534 @@
         dresp(end).var   ={};
         dresp(end).impfac=[];
-        while ~ieof && ...
+        while ischar(fline) && ...
                 ~strncmpi(fline,'Cumulative Distribution Function',32) && ...
                 ~strncmpi(fline,'MV Statistics for ',18) && ...
                 ~strncmp (fline,'-',1)
             fline=fgetl(fidi);
-            if ~ischar(fline)
-                ieof=1;
-                break;
-            end
         end
     end
@@ -557 +546 @@
     icdf=0;
 
-    while ~ieof && ~isempty(fline) && ...
+    while ischar(fline) && ~isempty(fline) && ...
             strncmpi(fline,'Cumulative Distribution Function',32)
         [ntokens,tokens]=fltokens(fline);
@@ -607 +596 @@
         display('    Cumulative Distribution Function not available.');
         dresp(ndresp).cdf=[];
-        while ~ieof && ...
+        while ischar(fline) && ...
                 ~strncmpi(fline,'MV Statistics for ',18) && ...
                 ~strncmp (fline,'-',1)
             fline=fgetl(fidi);
-            if ~ischar(fline)
-                ieof=1;
-                break;
-            end
         end
     end