Changeset 15801

Timestamp:

08/12/13 15:00:16 (12 years ago)

Author:

seroussi

Message:

CHG: finished boundary condition change in python

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

@@ -35 +35 @@
         md.stressbalance.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
         md.stressbalance.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-        md.stressbalance.spcvx[pos]=0
-        md.stressbalance.spcvy[pos]=0
-        md.stressbalance.spcvz[pos]=0
         md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6))
         md.stressbalance.loadingforce=0*numpy.ones((md.mesh.numberofvertices,3))
+
+        #First find segments that are not completely on the front
+        if md.mesh.dimension==2:
+                numbernodesfront=2
+        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]
+        md.stressbalance.spcvx[pos[:]]=0
+        md.stressbalance.spcvy[pos[:]]=0
+        md.stressbalance.spcvz[pos[:]]=0
 
         #Dirichlet Values

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

@@ -55 +55 @@
         else:
                 numbernodesfront=4
-        segmentsfront=numpy.nonzeros(md.mask.icelevelset(md.mesh.segments[:,0:-1]))
-        segments=(numpy.sum(segmentsfront,axis=1)!=numbernodesfront).astype(int) 
+        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]