Changeset 23463

Timestamp:

11/09/18 18:03:34 (6 years ago)

Author:

schlegel

Message:

BUG: Fuction now debugged, and add copy model for 3d

File:

• issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.py (modified) (3 diffs)

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

@@ -1 +1 @@
 import numpy as np
+import copy
 
 def AreaAverageOntoPartition(md,vector,layer=None):
@@ -11 +12 @@
 '''
         #some checks
-        if len(np.shape(md.mesh)) == 3:
+        if(md.mesh.dimension()==3):
                 if layer == None:
                         raise RuntimeError('AreaAverageOntoPartition: layer should be provided onto which Area Averaging occurs')
-                
+
                 #save 3D model
-                md3d = md
+                md3d = copy.deepcopy(md)
 
                 md.mesh.elements = md.mesh.elements2d
@@ -35 +36 @@
 
         #ok, first check that part is Matlab indexed
-        #part = md.qmu.partition
+        part = (md.qmu.partition).copy()
+        part = part.flatten() + 1
 
         #some check: 
-        if md.qmu.numberofpartitions != max(md.qmu.partition):
+        if md.qmu.numberofpartitions != max(part):
                 raise RuntimeError('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.partition)')
 
 
         #initialize output
-        partvector = np.zeros((max(md.qmu.partition),))
+        partvector = np.zeros((max(part)))
 
         #start weight average
         weightedvector = vector*md.qmu.vertex_weight
-        for i in range(max(md.qmu.partition)):
-                pos=np.where(md.qmu.partition==i)
+        for i in range(max(part)):
+                pos=np.where((part-1)==i)
                 partvector[i]=sum(weightedvector[pos])/sum(md.qmu.vertex_weight[pos])
 
 
         #in 3D, restore 3D model:
-        if len(np.shape(md.mesh)) == 3:
-                md = md3d
+        if(md.mesh.dimension()==3):
+                md = copy.deepcopy(md3d)
+
 
         return partvector