Changeset 26391

Timestamp:

08/12/21 18:02:48 (4 years ago)

Author:

schlegel

Message:

CHG: matice can handle rheology_B of python len 1 or more now

File:

• issm/trunk-jpl/src/m/classes/matice.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/matice.py

@@ -137 +137 @@
         WriteData(fid, prefix, 'object', self, 'class', 'materials', 'fieldname', 'thermal_exchange_velocity', 'format', 'Double')
         # NOTE: We first have to check if we have a NumPy array here
-        if ((len(np.shape(self.rheology_B)) == 1 and (np.shape(self.rheology_B)[0] == md.mesh.numberofvertices or np.shape(self.rheology_B)[0] == md.mesh.numberofvertices + 1)) or (len(np.shape(self.rheology_B)) == 2 and np.shape(self.rheology_B)[0] == md.mesh.numberofelements and np.shape(self.rheology_B)[1] > 1)):
+        if (((np.shape(self.rheology_B)[0] == md.mesh.numberofvertices) or (np.shape(self.rheology_B)[0] == md.mesh.numberofvertices + 1)) or ((len(np.shape(self.rheology_B)) == 2) and (np.shape(self.rheology_B)[0] == md.mesh.numberofelements) and (np.shape(self.rheology_B)[1] > 1))):
             mattype = 1
             tsl = md.mesh.numberofvertices