Changeset 26372

Timestamp:

07/30/21 19:18:56 (4 years ago)

Author:

schlegel

Message:

CHG: flatten only takes char inputs or none

File:

• issm/trunk-jpl/src/m/interp/averaging.py (modified) (4 diffs)

issm/trunk-jpl/src/m/interp/averaging.py

@@ -29 +29 @@
     """
 
-    if len(data) != md.mesh.numberofelements and len(data) != md.mesh.numberofvertices:
+    if (len(data) != md.mesh.numberofelements) & (len(data) != md.mesh.numberofvertices):
         raise Exception('averaging error message: data not supported yet')
-    if md.mesh.dimension() == 3 and layer != 0:
-        if layer <= 0 or layer > md.mesh.numberoflayers:
+    if (md.mesh.dimension() == 3) & (layer != 0):
+        if (layer <= 0) | (layer > md.mesh.numberoflayers):
             raise ValueError('layer should be between 1 and md.mesh.numberoflayers')
     else:
@@ -40 +40 @@
     if layer == 0:
         weights = np.zeros(md.mesh.numberofvertices, )
-        data = data.flatten(1)
+        data = np.asarray(data).flatten()
     else:
         weights = np.zeros(md.mesh.numberofvertices2d, )
@@ -67 +67 @@
 
     index = index - 1  # Python indexes from zero
-    line = index.flatten(1)
+    line = index.flatten()
     areas = np.vstack(areas).reshape(-1, )
     summation = 1. / rep * np.ones(rep, )
@@ -91 +91 @@
 
     # Return output as a full matrix (C code does not like sparse matrices)
-    average = np.asarray(average_node.todense()).reshape(-1, )
+    average = np.expand_dims(np.asarray(average_node.todense()).reshape(-1, ),axis=1)
 
     return average