Changeset 22272

Timestamp:

11/22/17 13:14:23 (7 years ago)

Author:

kruegern

Message:

ADD: added/fixed python tests 1108, 1109, and 1110. Made a minor change to src/m/solve/WriteData.py to match it with the .m version. If this caused a problem it should have been fixed immediately (see scale option, data[0:-2,:], -2 vs -1).

Location:

issm/trunk-jpl

Files:

• src/m/solve/WriteData.py (modified) (1 diff)
• test/NightlyRun/test1108.py (modified) (4 diffs)
• test/NightlyRun/test1109.py (added)
• test/NightlyRun/test1110.py (added)

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -45 +45 @@
                 scale = options.getfieldvalue('scale')
                 if np.size(data) > 1 and np.ndim(data) > 1 and np.size(data,0)==timeserieslength:
-                        data[0:-1,:] = scale*data[0:-1,:]
+                        data[0:-2,:] = scale*data[0:-2,:]
                 else:
                         data  = scale*data

issm/trunk-jpl/test/NightlyRun/test1108.py

@@ -8 +8 @@
 from setflowequation import *
 from solve import *
+from squaremesh import *
 
 from PythonFuncs import *
@@ -16 +17 @@
 """
 
+#L_list=[5000.,10000.,20000.,40000.,80000.,160000.]
 L_list=[80000.]
 results=[]
@@ -35 +37 @@
         md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices))
         
-        pos=np.nonzero(logical_and.reduce_n(md.mesh.vertexonbase,np.logical_or.reduce(md.mesh.x==0.,md.mesh.x==np.max(md.mesh.x)),np.logical_or.reduce(md.mesh.y==0.,md.mesh.y==np.max(md.mesh.y))))
+        maxx = max(md.mesh.x)
+        maxy = max(md.mesh.y)
+        posA = np.where(md.mesh.vertexonbase)
+        posB = np.unique(np.concatenate((np.where(md.mesh.x==0.), np.where(md.mesh.x==maxx))))
+        posC = np.unique(np.concatenate((np.where(md.mesh.y==0.), np.where(md.mesh.y==maxy))))
+        pos = np.intersect1d(np.intersect1d(posA,posB),posC)
+
         md.stressbalance.spcvx[pos]=0.
         md.stressbalance.spcvy[pos]=0.
@@ -44 +52 @@
         posx2=np.nonzero(md.mesh.x==np.max(md.mesh.x))[0]
 
-        posy=np.nonzero(logical_and.reduce_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=np.max(md.mesh.x)))[0]    #Don't take the same nodes two times
-        posy2=np.nonzero(logical_and.reduce_n(md.mesh.y==np.max(md.mesh.y),md.mesh.x!=0.,md.mesh.x!=np.max(md.mesh.x)))[0]
+        posy=np.intersect1d(np.intersect1d(np.where(md.mesh.y==0.),np.where(md.mesh.x!=0.)),np.where(md.mesh.x!=np.max(md.mesh.x)))[0]    #Don't take the same nodes two times
+        posy2=np.intersect1d(np.intersect1d(np.where(md.mesh.y==np.max(md.mesh.y)),np.where(md.mesh.x!=0.)),np.where(md.mesh.x!=np.max(md.mesh.x)))[0]
 
         md.stressbalance.vertex_pairing=np.vstack((np.hstack((posx.reshape(-1,1)+1,posx2.reshape(-1,1)+1)),np.hstack((posy.reshape(-1,1)+1,posy2.reshape(-1,1)+1))))