Changeset 4431

Timestamp:

07/07/10 11:41:59 (15 years ago)

Author:

jschierm

Message:

Qmu: apply changes to hutter and stokes as well.

File:

• issm/trunk/src/m/dakota/qmuresponse.m (modified) (3 diffs)

issm/trunk/src/m/dakota/qmuresponse.m

@@ -32 +32 @@
         isstokes=m_ds.parameters.isstokes;
         if ishutter,
+
+% for now, separate all segments from double array for parallel to make cells
+                if (length(m_dhu.parameters.qmu_mass_flux_num_segments) > 1)
+                        segments=m_dhu.parameters.qmu_mass_flux_segments;
+                        m_dhu.parameters.qmu_mass_flux_segments=cell(size(m_dhu.parameters.qmu_mass_flux_num_segments));
+                        ipt=1;
+                        for i=1:length(m_dhu.parameters.qmu_mass_flux_num_segments)
+                                if m_dhu.parameters.qmu_mass_flux_num_segments(i)
+                                        m_dhu.parameters.qmu_mass_flux_segments{i}=segments(ipt:ipt+m_dhu.parameters.qmu_mass_flux_num_segments(i)-1,:);
+                                        ipt=ipt+m_dhu.parameters.qmu_mass_flux_num_segments(i);
+                                end
+                        end
+                        clear segments
+                end
+
                 if isnumeric(m_dhu.parameters.qmu_mass_flux_segments)
                         response=MassFlux(m_dhu.elements,m_dhu.nodes,m_dhu.vertices,m_dhu.loads,m_dhu.materials,m_dhu.parameters,results.u_g);
@@ -41 +56 @@
                         clear save
                 end
+
         elseif ismacayealpattyn,
 
 % for now, separate all segments from double array for parallel to make cells
-        if (length(m_dh.parameters.qmu_mass_flux_num_segments) > 1)
-                segments=m_dh.parameters.qmu_mass_flux_segments;
-                m_dh.parameters.qmu_mass_flux_segments=cell(size(m_dh.parameters.qmu_mass_flux_num_segments));
-                ipt=1;
-                for i=1:length(m_dh.parameters.qmu_mass_flux_num_segments)
-                        if m_dh.parameters.qmu_mass_flux_num_segments(i)
-                                m_dh.parameters.qmu_mass_flux_segments{i}=segments(ipt:ipt+m_dh.parameters.qmu_mass_flux_num_segments(i)-1,:);
-                                ipt=ipt+m_dh.parameters.qmu_mass_flux_num_segments(i);
+                if (length(m_dh.parameters.qmu_mass_flux_num_segments) > 1)
+                        segments=m_dh.parameters.qmu_mass_flux_segments;
+                        m_dh.parameters.qmu_mass_flux_segments=cell(size(m_dh.parameters.qmu_mass_flux_num_segments));
+                        ipt=1;
+                        for i=1:length(m_dh.parameters.qmu_mass_flux_num_segments)
+                                if m_dh.parameters.qmu_mass_flux_num_segments(i)
+                                        m_dh.parameters.qmu_mass_flux_segments{i}=segments(ipt:ipt+m_dh.parameters.qmu_mass_flux_num_segments(i)-1,:);
+                                        ipt=ipt+m_dh.parameters.qmu_mass_flux_num_segments(i);
+                                end
                         end
+                        clear segments
                 end
-                clear segments
-        end
 
                 if isnumeric(m_dh.parameters.qmu_mass_flux_segments)
@@ -66 +82 @@
                         clear save
                 end
+
         elseif isstokes,
+
+% for now, separate all segments from double array for parallel to make cells
+                if (length(m_ds.parameters.qmu_mass_flux_num_segments) > 1)
+                        segments=m_ds.parameters.qmu_mass_flux_segments;
+                        m_ds.parameters.qmu_mass_flux_segments=cell(size(m_ds.parameters.qmu_mass_flux_num_segments));
+                        ipt=1;
+                        for i=1:length(m_ds.parameters.qmu_mass_flux_num_segments)
+                                if m_ds.parameters.qmu_mass_flux_num_segments(i)
+                                        m_ds.parameters.qmu_mass_flux_segments{i}=segments(ipt:ipt+m_ds.parameters.qmu_mass_flux_num_segments(i)-1,:);
+                                        ipt=ipt+m_ds.parameters.qmu_mass_flux_num_segments(i);
+                                end
+                        end
+                        clear segments
+                end
+
                 if isnumeric(m_ds.parameters.qmu_mass_flux_segments)
                         response=MassFlux(m_ds.elements,m_ds.nodes,m_ds.vertices,m_ds.loads,m_ds.materials,m_ds.parameters,results.u_g);