Index: /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m
===================================================================
--- /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m	(revision 25003)
+++ /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m	(revision 25004)
@@ -1,3 +1,3 @@
-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,13 +29,14 @@
 	%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
 
Index: /issm/trunk-jpl/src/m/qmu/importancefactors.m
===================================================================
--- /issm/trunk-jpl/src/m/qmu/importancefactors.m	(revision 25003)
+++ /issm/trunk-jpl/src/m/qmu/importancefactors.m	(revision 25004)
@@ -1,3 +1,3 @@
-function factors=importancefactors(md,variablename,responsename)
+function factors=importancefactors(md,variablename,responsename,partition)
 %IMPORTANCEFACTORS - compute importance factors for a certain variable and response.
 %
@@ -44,10 +44,10 @@
 	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