Changeset 25004

Timestamp:

06/10/20 21:25:19 (5 years ago)

Author:

Eric.Larour

Message:

CHG: switching to partition vectors instead of qmu.vpartition and qmu.epartition

Location:

issm/trunk-jpl/src/m

Files:

• partition/AreaAverageOntoPartition.m (modified) (2 diffs)
• qmu/importancefactors.m (modified) (2 diffs)

issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m

@@ -1 @@
-function partvector=AreaAverageOntoPartition(md,vector,layer)
+function partvector=AreaAverageOntoPartition(md,vector,layer,partition)
 %AREAAVERAGEONTOPARTITION 
 %   compute partition values for a certain vector expressed on the vertices of the mesh.
@@ -29 +29 @@
         %finally, project vector: 
         vector=project2d(md3d,vector,layer);
-        md.qmu.vpartition=project2d(md3d,md3d.qmu.vpartition,layer);
+        partition=project2d(md3d,partition,layer);
 end
 
 %ok, first check that part is Matlab indexed
-part=md.qmu.vpartition+1;
+part=partition+1;
 
 %some check: 
-if md.qmu.numberofpartitions~=max(part),
-        error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.vpartition)');
+npart=qmupart2npart(partition);
+if npart~=max(part),
+        error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(partition)');
 end
 

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

@@ -1 @@
-function factors=importancefactors(md,variablename,responsename)
+function factors=importancefactors(md,variablename,responsename,partition)
 %IMPORTANCEFACTORS - compute importance factors for a certain variable and response.
 %
@@ -44 +44 @@
         factors=importancefactors;
         return;
-elseif count==max(md.qmu.epartition+1)
+elseif count==max(partition+1)
         %distribute importance factor
-        factors=importancefactors(md.qmu.epartition'+1); %md.qmu.partition was created to index "c" style
+        factors=importancefactors(partition'+1); %partition was created to index "c" style
 else
         %distribute importance factor
-        factors=importancefactors(md.qmu.vpartition'+1); %md.qmu.partition was created to index "c" style
+        factors=importancefactors(partition'+1); %partition was created to index "c" style
 end