Changeset 25041

Timestamp:

06/16/20 19:42:32 (5 years ago)

Author:

Eric.Larour

Message:

CHG: adding correlatoin matrix.

Location:

issm/trunk-jpl/src/m

Files:

• classes/qmu.m (modified) (1 diff)
• qmu/dakota_in_data.m (modified) (4 diffs)
• qmu/dakota_in_write.m (modified) (4 diffs)
• qmu/preqmu.m (modified) (1 diff)

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

@@ -9 +9 @@
                 output                      = 0;
                 variables                   = struct();
+                correlation_matrix          = [];
                 responses                   = struct();
                 method                      = struct();

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

@@ -2 +2 @@
 %  define the data to write the dakota .in and .m files.
 %
-%  []=dakota_in_data(dmeth,variables,responses,dparams,filei,varargin)
+%  []=dakota_in_data(dmeth,variables,responses,dparams,filei,corrin,varargin)
 %
 %  where the required input is:
@@ -10 +10 @@
 %    dparams       (structure array, method-independent parameters)
 %    filei         (character, name of .in and .m files)
+%    corrin        (correlation matrix)
 %
 %  params may be empty, in which case defaults will be used.
@@ -46 +47 @@
 %  to foreign countries or providing access to foreign persons."
 %
-function []=dakota_in_data(dmeth,variables,responses,dparams,filei,varargin)
+function []=dakota_in_data(dmeth,variables,responses,dparams,filei,corrin,varargin)
 
 if ~nargin
@@ -118 +119 @@
 
 %Write in file
-dakota_in_write(dmeth,dvar,dresp,params,filei,varargin{:});
+dakota_in_write(dmeth,dvar,dresp,params,filei,corrin,varargin{:});
 
 end

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

@@ -40 +40 @@
 %  to foreign countries or providing access to foreign persons."
 %
-function []=dakota_in_write(method,dvar,dresp,params,filei,varargin)
+function []=dakota_in_write(method,dvar,dresp,params,filei,corrin,varargin)
 
 if ~nargin
@@ -99 +99 @@
 %  write the variables section
 
-variables_write(fidi,dmeth,dvar);
+variables_write(fidi,dmeth,dvar,corrin);
 
 %  write the interface section
@@ -181 +181 @@
 %%  function to write the variables section of the file
 
-function []=variables_write(fidi,dmeth,dvar)
+function []=variables_write(fidi,dmeth,dvar,corrin)
 
 display('Writing variables section of Dakota input file.');
@@ -198 +198 @@
     fhvar=str2func([dmeth.lcspec{i}    '.dakota_write']);
     fhvar(fidi,dvar);
+end
+
+% write correlation matrix: 
+if ~isempty(corrin),
+        fprintf(fidi,'uncertain_correlation_matrix\n');
+        for i=1:size(corrin,1),
+                for j=1:size(corrin,2),
+                        fprintf(fidi,'%g ',corrin(i,j));
+                end
+                fprintf(fidi,'\n');
+        end
 end
 

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

@@ -67 +67 @@
 
 %create in file for dakota
-dakota_in_data(md.qmu.method(imethod),variables,responses,md.qmu.params(iparams),qmufile);
+dakota_in_data(md.qmu.method(imethod),variables,responses,md.qmu.params(iparams),qmufile,md.qmu.correlation_matrix);
 
 %build a list of variables and responses descriptors. the list is not expanded.