Changeset 24293

Timestamp:

10/30/19 09:55:23 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing Basile s commit

File:

• issm/trunk-jpl/src/m/parameterization/setflowequation.py (modified) (1 diff)

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -92 +92 @@
     #First modify FSflag to get rid of elements contrained everywhere (spc + border with HO or SSA)
     if any(FSflag):
-        fullspcnodes = np.logical_or(~np.isnan(md.stressbalance.spcvx) + ~np.isnan(md.stressbalance.spcvy) + ~np.isnan(md.stressbalance.spcvz) == 3, np.logical_and(nodeonHO, nodeonFS))  #find all the nodes on the boundary of the domain without icefront
+        fullspcnodes = np.logical_or(~np.isnan(md.stressbalance.spcvx) & ~np.isnan(md.stressbalance.spcvy) & ~np.isnan(md.stressbalance.spcvz), np.logical_and(nodeonHO, nodeonFS))  #find all the nodes on the boundary of the domain without icefront
         fullspcelems = np.sum(fullspcnodes[md.mesh.elements - 1], axis=1) == 6  #find all the nodes on the boundary of the domain without icefront
         FSflag[np.where(fullspcelems.reshape(-1))] = False