Changeset 17876

Timestamp:

04/29/14 10:36:31 (11 years ago)

Author:

cborstad

Message:

CHG: treat stressbalance spc's as rank-1

Location:

issm/trunk-jpl/src/m/boundaryconditions

Files:

• SetIceSheetBC.py (modified) (1 diff)
• SetIceShelfBC.py (modified) (2 diffs)
• SetMarineIceSheetBC.py (modified) (2 diffs)

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

@@ -15 +15 @@
         #node on Dirichlet
         pos=numpy.nonzero(md.mesh.vertexonboundary)
-        md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-        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=float('nan')*numpy.ones(md.mesh.numberofvertices))
+        md.stressbalance.spcvy=float('nan')*numpy.ones(md.mesh.numberofvertices))
+        md.stressbalance.spcvz=float('nan')*numpy.ones(md.mesh.numberofvertices))
         md.stressbalance.spcvx[pos]=0
         md.stressbalance.spcvy[pos]=0

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

@@ -33 +33 @@
 #       pos=find(md.mesh.vertexonboundary & ~nodeonicefront);
         pos=numpy.nonzero(numpy.logical_and(md.mesh.vertexonboundary,numpy.logical_not(nodeonicefront)))[0]
-        md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-        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=float('nan')*numpy.ones(md.mesh.numberofvertices)
+        md.stressbalance.spcvy=float('nan')*numpy.ones(md.mesh.numberofvertices)
+        md.stressbalance.spcvz=float('nan')*numpy.ones(md.mesh.numberofvertices)
         md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6))
         md.stressbalance.loadingforce=0*numpy.ones((md.mesh.numberofvertices,3))
@@ -59 +59 @@
         else:
                 pos=numpy.nonzero(md.mesh.vertexonboundary)[0]
-        md.stressbalance.spcvx[pos[:]]=0
-        md.stressbalance.spcvy[pos[:]]=0
-        md.stressbalance.spcvz[pos[:]]=0
+        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

@@ -42 +42 @@
                 print "SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually."
 
-        md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,))
-        md.stressbalance.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,))
-        md.stressbalance.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,))
+        md.stressbalance.spcvx=float('nan')*numpy.ones(md.mesh.numberofvertices)
+        md.stressbalance.spcvy=float('nan')*numpy.ones(md.mesh.numberofvertices)
+        md.stressbalance.spcvz=float('nan')*numpy.ones(md.mesh.numberofvertices)
         md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6))
         md.stressbalance.loadingforce=0*numpy.ones((md.mesh.numberofvertices,3))
@@ -68 +68 @@
         else:
                 pos=numpy.nonzero(md.mesh.vertexonboundary)[0]
-        md.stressbalance.spcvx[pos[:]]=0
-        md.stressbalance.spcvy[pos[:]]=0
-        md.stressbalance.spcvz[pos[:]]=0
+        md.stressbalance.spcvx[pos]=0
+        md.stressbalance.spcvy[pos]=0
+        md.stressbalance.spcvz[pos]=0
 
         #Dirichlet Values