Changeset 15807

Timestamp:

08/12/13 17:11:24 (12 years ago)

Author:

seroussi

Message:

BUG: trying to fix python BC

Location:

issm/trunk-jpl/src/m/boundaryconditions

Files:

• SetIceShelfBC.py (modified) (1 diff)
• SetMarineIceSheetBC.py (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -47 +47 @@
         else:
                 numbernodesfront=4
-        values=md.mask.icelevelset[md.mesh.segments[:,0:-1]]
-        segmentsfront=1-values
-        segments=(numpy.sum(segmentsfront,axis=1)!=numbernodesfront).astype(int)
-        #Find all nodes for these segments and spc them
-        pos=md.mesh.segments[segments,0:-1]
+        if any(md.mask.icelevelset<=0):
+                values=md.mask.icelevelset[md.mesh.segments[:,0:-1]]
+                segmentsfront=1-values
+                segments=(numpy.sum(segmentsfront,axis=1)!=numbernodesfront).astype(int)
+                #Find all nodes for these segments and spc them
+                pos=md.mesh.segments[segments,0:-1]
+        else:
+                pos=numpy.nonzero(md.mesh.vertexonboundary)[0]
         md.stressbalance.spcvx[pos[:]]=0
         md.stressbalance.spcvy[pos[:]]=0

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

@@ -55 +55 @@
         else:
                 numbernodesfront=4
-        values=md.mask.icelevelset[md.mesh.segments[:,0:-1]]
-        segmentsfront=1-values
-        segments=(numpy.sum(segmentsfront,axis=1)!=numbernodesfront).astype(int)
-        #Find all nodes for these segments and spc them
-        pos=md.mesh.segments[segments,0:-1]
+        if any(md.mask.icelevelset<=0):
+                values=md.mask.icelevelset[md.mesh.segments[:,0:-1]]
+                segmentsfront=1-values
+                segments=(numpy.sum(segmentsfront,axis=1)!=numbernodesfront).astype(int)
+                #Find all nodes for these segments and spc them
+                pos=md.mesh.segments[segments,0:-1]
+        else:
+                pos=numpy.nonzero(md.mesh.vertexonboundary)[0]
         md.stressbalance.spcvx[pos[:]]=0
         md.stressbalance.spcvy[pos[:]]=0