Changeset 9668

Timestamp:

09/07/11 15:42:46 (14 years ago)

Author:

seroussi

Message:

more qmu stuff

Location:

issm/trunk/src/m

Files:

• classes/qmu.m (modified) (3 diffs)
• model/partition/adjacency.m (modified) (2 diffs)
• model/partition/partitioner.m (modified) (2 diffs)
• qmu/expandresponses.m (modified) (1 diff)
• qmu/expandvariables.m (modified) (1 diff)
• qmu/preqmu.m (modified) (1 diff)

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

@@ -85 +85 @@
 
                         disp(sprintf('         qmu_method:  (array of dakota_method class)'));
-                        for i=1:numel(obj.qmu_method);
-                                if strcmp(class(obj.qmu_method(i)),'dakota_method')
+                        for i=1:numel(obj.method);
+                                if strcmp(class(obj.method(i)),'dakota_method')
                                         disp(sprintf('            method%s :    ''%s''',...
-                                                string_dim(obj.qmu_method,i),obj.qmu_method(i).method));
+                                                string_dim(obj.method,i),obj.method(i).method));
                                 end
                         end
 
-                        for i=1:numel(obj.qmu_params)
+                        for i=1:numel(obj.params)
                                 disp(sprintf('         qmu_params%s:  (array of method-independent parameters)',...
-                                        string_dim(obj.qmu_params,i)));
-                                fnames=fieldnames(obj.qmu_params(i));
+                                        string_dim(obj.params,i)));
+                                fnames=fieldnames(obj.params(i));
                                 maxlen=0;
                                 for j=1:numel(fnames)
@@ -103 +103 @@
                                 for j=1:numel(fnames)
                                         disp(sprintf(['            %-' num2str(maxlen+1) 's: %s'],...
-                                                fnames{j},any2str(obj.qmu_params(i).(fnames{j}))));
+                                                fnames{j},any2str(obj.params(i).(fnames{j}))));
                                 end
                         end
 
-                        for i=1:numel(obj.dakotaresults)
-                                disp(sprintf('         dakotaresults%s:  (information from dakota files)',...
-                                        string_dim(obj.dakotaresults,i)));
-                                fnames=fieldnames(obj.dakotaresults(i));
+                        for i=1:numel(obj.results)
+                                disp(sprintf('         results%s:  (information from dakota files)',...
+                                        string_dim(obj.results,i)));
+                                fnames=fieldnames(obj.results(i));
                                 maxlen=0;
                                 for j=1:numel(fnames)
@@ -118 +118 @@
                                 for j=1:numel(fnames)
                                         disp(sprintf(['            %-' num2str(maxlen+1) 's:    [%ix%i]    ''%s'''],...
-                                                fnames{j},size(obj.dakotaresults.(fnames{j})),class(obj.dakotaresults.(fnames{j}))));
+                                                fnames{j},size(obj.results.(fnames{j})),class(obj.results.(fnames{j}))));
                                 end
                         end
 
-                        disp(sprintf('         npart   : %i (number of partitions for semi-descrete qmu)',obj.npart));
-                        disp(sprintf('         part    : [%i] (user provided mesh partition, defaults to metis if not specified)',length(obj.part)));
+                        disp(sprintf('         numberofpartitions   : %i (number of partitions for semi-descrete qmu)',obj.numberofpartitions));
+                        disp(sprintf('         partition    : [%i] (user provided mesh partitionition, defaults to metis if not specified)',length(obj.partition)));
                 end % }}}
         end

issm/trunk/src/m/model/partition/adjacency.m

@@ -6 +6 @@
 %  the required output is:
 %    md.adj_mat     (double [sparse nv x nv], vertex adjacency matrix)
-%    md.vertex_weight        (double [nv], vertex weights)
+%    md.qmu.vertex_weight        (double [nv], vertex weights)
 
 indi=[md.elements(:,1);md.elements(:,2);md.elements(:,3)];
@@ -24 +24 @@
 pos=find(connectivity);
 connectivity(pos)=areas(connectivity(pos))/3;
-md.vertex_weight=sum(connectivity,2);
+md.qmu.vertex_weight=sum(connectivity,2);

issm/trunk/src/m/model/partition/partitioner.m

@@ -1 @@
-function md.qmu.partitionitioner(md,varargin)
+function md=partitioner(md,varargin)
 %PARTITIONER - partition mesh 
 %
@@ -12 +12 @@
 %   
 %   Usage:
-%      md.qmu.partitionitioner(md,'package','chaco','npart',100,'weighting','on');
+%      md=partitioner(md,'package','chaco','npart',100,'weighting','on');
 %
 

issm/trunk/src/m/qmu/expandresponses.m

@@ -1 @@
-function dresp=expandresponses(md.qmu.responses)
+function dresp=expandresponses(md,responses)
 
 fnames=fieldnames(responses);

issm/trunk/src/m/qmu/expandvariables.m

@@ -1 @@
-function dvar=expandvariables(md.qmu.variables)
+function dvar=expandvariables(md,variables)
 
 fnames=fieldnames(variables);

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

@@ -41 +41 @@
 
 %expand variables and responses
-variables=expandvariables(md.qmu.variables);
-responses=expandresponses(md.qmu.responses);
+variables=expandvariables(md,variables);
+responses=expandresponses(md,responses);
 
 %go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{1