Changeset 26389

Timestamp:

08/11/21 17:30:21 (4 years ago)

Author:

schlegel

Message:

CHG: python match spc check in matlab

File:

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

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

@@ -140 +140 @@
         # Singular solution
         #        if ~any((~isnan(md.stressbalance.spcvx) + ~isnan(md.stressbalance.spcvy)) == 2),
-        if not np.any(np.logical_and(np.logical_not(np.isnan(md.stressbalance.spcvx)), np.logical_not(np.isnan(md.stressbalance.spcvy)))):
+        if (not np.any(np.logical_or(np.logical_not(np.isnan(md.stressbalance.spcvx)), np.logical_not(np.isnan(md.stressbalance.spcvy))))) & (not np.any(md.mask.ocean_levelset>0)):
             print("\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n")
         # CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES