Changeset 24288

Timestamp:

10/29/19 08:15:50 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing Basile's commit

Location:

issm/trunk-jpl/src/m/classes

Files:

• masstransport.py (modified) (1 diff)
• stressbalance.py (modified) (1 diff)

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

@@ -74 +74 @@
         md = checkfield(md, 'fieldname', 'masstransport.min_thickness', '>', 0)
         md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1)
-        md = checkfield(md, 'fieldname', 'masstransport.vertex_pairing', '>', 0)
+        if not np.any(np.isnan(self.vertex_pairing)):
+            md = checkfield(md, 'fieldname', 'masstransport.vertex_pairing', '>', 0)
 
         return md

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

@@ -134 +134 @@
         md = checkfield(md, 'fieldname', 'stressbalance.loadingforce', 'size', [md.mesh.numberofvertices, 3])
         md = checkfield(md, 'fieldname', 'stressbalance.requested_outputs', 'stringrow', 1)
-        md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
+        if not np.any(np.isnan(self.vertex_pairing)):
+            md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
         #singular solution
         #        if ~any((~isnan(md.stressbalance.spcvx) + ~isnan(md.stressbalance.spcvy)) == 2),