Changeset 25836 for issm/trunk/src/m/partition/AreaAverageOntoPartition.py

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/partition/AreaAverageOntoPartition.py (modified) (3 diffs)

issm/trunk/src/m/partition/AreaAverageOntoPartition.py

@@ +1 @@
+import copy
+
 import numpy as np
-import copy
+
 from adjacency import adjacency
 from project2d import project2d
+from qmupart2npart import qmupart2npart
 
 
-def AreaAverageOntoPartition(md, vector, layer=None):
-    '''AREAAVERAGEONTOPARTITION
-   compute partition values for a certain vector expressed on the vertices of the mesh.
-   Use area weighted average.
+def AreaAverageOntoPartition(md, vector, partition, layer=None):
+    '''
+    AREAAVERAGEONTOPARTITION - compute partition values for a certain vector expressed on the vertices of the mesh.
+    Use area weighted average.
 
-   Usage:
-      average = AreaAverageOntoPartition(md, vector)
-      average = AreaAverageOntoPartition(md, vector, layer)  #if in 3D, chose which layer is partitioned
-'''
+    Usage:
+        average = AreaAverageOntoPartition(md, vector)
+        average = AreaAverageOntoPartition(md, vector, layer) # If in 3D, chose which layer is partitioned
+    '''
+
     #some checks
     if(md.mesh.dimension() == 3):
@@ -19 +23 @@
             raise RuntimeError('AreaAverageOntoPartition: layer should be provided onto which Area Averaging occurs')
 
-    #save 3D model
+        #save 3D model
         md3d = copy.deepcopy(md)
 
@@ -30 +34 @@
         md.mesh.vertexconnectivity = []
 
-    #run connectivity routine
+        #run connectivity routine
         md = adjacency(md)
 
     #finally, project vector:
         vector = project2d(md3d, vector, layer)
-        md.qmu.vpartition = project2d(md3d, md3d.qmu.vpartition, layer)
+        partition = project2d(md3d, partition, layer)
 
     #ok, first check that part is Matlab indexed
-    part = (md.qmu.vpartition).copy()
+    part = partition.copy()
     part = part.flatten() + 1
 
     #some check:
-    if md.qmu.numberofpartitions != max(part):
-        raise RuntimeError('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.vpartition)')
+    npart = qmupart2npart(partition)
+    if npart != max(part):
+        raise RuntimeError('AreaAverageOntoPartition error message: ''npart'' should be equal to max(partition)')
 
     #initialize output