Changeset 26407

Timestamp:

08/23/21 18:05:43 (4 years ago)

Author:

schlegel

Message:

CHG: some updates for test2003 to run

Location:

issm/trunk-jpl/src/m

Files:

• classes/matice.py (modified) (1 diff)
• mesh/planet/gmsh/gmshplanet.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 (((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.size(self.rheology_B)==1 or (((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

issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

@@ -28 +28 @@
     subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     outs, errs = subproc.communicate()
-    if errs != '':
+
+    if ((not isinstance(errs,bytes)) & (errs != '')) or (isinstance(errs,bytes) & (errs.decode() != '')):
         raise Exception('gmshplanet: call to gmsh failed: {}'.format(errs))
     gmshmajorversion = int(outs)