Changeset 5215

Timestamp:

08/12/10 17:51:48 (15 years ago)

Author:

Eric.Larour

Message:

Now we expand the variables before going into dakota_in_data, which simplifies a lot
of the preqmu and marshalling.
Simplified also the QmuSetupDesign: no need for all these individual drivers.

Location:

issm/trunk/src/m/qmu

Files:

• dakota_in_data.m (modified) (1 diff)
• expandvariables.m (added)
• postqmu.m (modified) (1 diff)
• preqmu.m (modified) (1 diff)
• qmumarshall.m (modified) (1 diff)
• setupdesign/QmuSetupDesign.m (modified) (3 diffs)
• setupdesign/setupriftsfriction.m (modified) (1 diff)

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

@@ -94 +94 @@
 
 for i=1:length(fnames)
+
+%  currently all variable types can just be copied
+        dvar.(fnames{i})=variables.(fnames{i});
+
+end
     
-%  for linear constraints, just copy
-
-    if isa(variables.(fnames{i}),'linear_inequality_constraint') || ...
-       isa(variables.(fnames{i}),'linear_equality_constraint'  )
-        dvar.(fnames{i})=variables.(fnames{i});
-
-%  for variables, call the setup function
-
-    else
-        fhandle=str2func([class(variables.(fnames{i})) '.empty']);
-        dvar.(fnames{i})=fhandle();
-        for j=1:length(variables.(fnames{i}))
-            %call setupdesign
-            dvar.(fnames{i})=QmuSetupDesign(dvar.(fnames{i}),variables.(fnames{i})(j),params,varargin{:});
-        end
-    end
-end
-
-
 %%  responses
 

issm/trunk/src/m/qmu/postqmu.m

@@ -48 +48 @@
 end
 
+%scale  sensitivities by partitioned average of the input parameter
+disp('Do this for god''s akes!');
+
+
 %put dakotaresults in their right location.
 md.results.dakota=dakotaresults;

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

@@ -41 +41 @@
 responses=md.responses(options.iresp);
 
+%expand variables
+variables=expandvariables(md,md.variables);
+
+%go through variables, and check they don't have more than md.npart values
+variable_fieldnames=fieldnames(variables);
+for i=1:length(variable_fieldnames),
+        field_name=variable_fieldnames{i};
+        fieldvariables=variables.(field_name);
+        if numel(fieldvariables)>md.npart,
+                error('preqmu error message: one of the expanded variables has more values than the number of partitions (setup in md.npart)');
+        end
+end
+
 %create m and in files for dakota
-dakota_in_data(md.qmu_method(options.imethod),variables,md.responses,md.qmu_params(options.iparams),options.qmufile,md);
+dakota_in_data(md.qmu_method(options.imethod),variables,md.responses,md.qmu_params(options.iparams),options.qmufile);
 
 %in library mode, we only need the dakota in file

issm/trunk/src/m/qmu/qmumarshall.m

@@ -21 +21 @@
 end
 
-%count how many variables we have
-numvariables=0;
-variable_fieldnames=fieldnames(variables);
-for i=1:length(variable_fieldnames),
-        field_name=variable_fieldnames{i};
-        fieldvariables=variables.(field_name);
-        numvariables=numvariables+numel(variables.(field_name));
-end
 %write number of variables to disk
-WriteData(fid,numvariables,'Integer','numberofvariables');
+WriteData(fid,md.numberofvariables,'Integer','numberofvariables');
 
 %now, for each variable, write descriptor
-count=0;
-for i=1:length(variable_fieldnames),
-        field_name=variable_fieldnames{i};
-        fieldvariables=variables.(field_name);
-        for j=1:length(fieldvariables),
-                descriptor=fieldvariables(j).descriptor;
-                WriteData(fid,descriptor,'String',['variabledescriptor' num2str(count)]);
-                count=count+1;
-        end
+for i=1:numel(md.variabledescriptors),
+        field_name=md.variabledescriptors{i};
+        WriteData(fid,field_name,'String',['variabledescriptor' num2str(i)]);
 end
+
 
 %deal with responses
 
-%count how many responses we have
-numresponses=0;
-response_fieldnames=fieldnames(responses);
-for i=1:length(response_fieldnames),
-        field_name=response_fieldnames{i};
-        fieldresponses=responses.(field_name);
-        numresponses=numresponses+numel(responses.(field_name));
-end
 %write number of responses to disk
-WriteData(fid,numresponses,'Integer','numberofresponses');
+WriteData(fid,md.numberofresponses,'Integer','numberofresponses');
 
 %now, for each response, write descriptor
-count=0;
-for i=1:length(response_fieldnames),
-        field_name=response_fieldnames{i};
-        fieldresponses=responses.(field_name);
-        for j=1:length(fieldresponses),
-                descriptor=fieldresponses(j).descriptor;
-                WriteData(fid,descriptor,'String',['responsedescriptor' num2str(count)]);
-                count=count+1;
-        end
+for i=1:numel(md.responsedescriptors),
+        field_name=md.responsedescriptors{i};
+        WriteData(fid,field_name,'String',['responsedescriptor' num2str(i)]);
 end
+
 
 %write response specific data
 qmu_segments=0;
-count=0;
-for i=1:length(response_fieldnames),
-        field_name=response_fieldnames{i};
-        fieldresponses=responses.(field_name);
-        for j=1:length(fieldresponses),
-                descriptor=fieldresponses(j).descriptor;
-                if strncmpi(descriptor,'MassFlux',8),
-                        qmu_segments=1;
-                end
+
+for i=1:numel(md.responsedescriptors),
+        field_name=md.responsedescriptors{i};
+        if strncmpi(field_name,'MassFlux',8),
+                qmu_segments=1;
         end
 end

issm/trunk/src/m/qmu/setupdesign/QmuSetupDesign.m

@@ -1 @@
-function dvar=QmuSetupDesign(dvar,variables,params,varargin)
-
-%recover model
-for i=1:length(varargin)
-    if strcmp(class(varargin{i}),'model')
-        md=varargin{i};
-        break;
-    end
-end
-
+function dvar=QmuSetupDesign(md,dvar,variables)
 
 %get descriptor
@@ -18 +9 @@
 %if descriptor is something like 'Thickness1','Surface10', etc ... the variable expansion already did the work, skip
 if qmuisdistributed(descriptor),
+        dvar(end+1)=variables;
         return;
 end
@@ -46 +38 @@
 case {'RiftsFriction'},
         
-        dvar=setupriftsfriction(dvar,variables,params,varargin{:});
+        dvar=setupriftsfriction(md,dvar,variable);
 
 otherwise

issm/trunk/src/m/qmu/setupdesign/setupriftsfriction.m

@@ -1 @@
-function dvar=setupriftsfriction(dvar,variables,params,varargin)
-
-for i=1:length(varargin)
-    if strcmp(class(varargin{i}),'model')
-        md=varargin{i};
-        break;
-    end
-end
+function dvar=setupriftsfriction(md,dvar,variables)
 
 %we have several rifts.