Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test1105.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test1105.py (modified) (10 diffs)

issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test1105.py

@@ -1 +1 @@
 #Test Name: ISMIPCHO
-import numpy
+import numpy as np
 import shutil
 from model import *
+from socket import gethostname
 from squaremesh import *
 from setmask import *
@@ -8 +9 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
-from PythonFuncs import *
 
 """
@@ -18 +17 @@
 printingflag=False
 
-L_list=[5000.,10000.,20000.,40000.,80000.,160000.]
+L_list=[80000.]
 results=[]
 minvx=[]
@@ -35 +34 @@
 
         #Create MPCs to have periodic boundary conditions
-        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=np.nan*np.ones((md.mesh.numberofvertices))
+        md.stressbalance.spcvy=np.nan*np.ones((md.mesh.numberofvertices))
+        md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices))
 
-        posx=numpy.nonzero(logical_and_n(md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=L))[0]
-        posx2=numpy.nonzero(logical_and_n(md.mesh.x==L,md.mesh.y!=0.,md.mesh.y!=L))[0]
+        posx=np.where(np.logical_and.reduce((md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=L)))[0]
+        posx2=np.where(np.logical_and.reduce((md.mesh.x==L,md.mesh.y!=0.,md.mesh.y!=L)))[0]
 
-        posy=numpy.nonzero(logical_and_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=L))[0]    #Don't take the same nodes two times
-        posy2=numpy.nonzero(logical_and_n(md.mesh.y==L,md.mesh.x!=0.,md.mesh.x!=L))[0]
+        posy=np.where(np.logical_and.reduce((md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=L)))[0]    #Don't take the same nodes two times
+        posy2=np.where(np.logical_and.reduce((md.mesh.y==L,md.mesh.x!=0.,md.mesh.x!=L)))[0]
 
-        md.stressbalance.vertex_pairing=numpy.vstack((numpy.hstack((posx.reshape(-1,1)+1,posx2.reshape(-1,1)+1)),numpy.hstack((posy.reshape(-1,1)+1,posy2.reshape(-1,1)+1))))
+        md.stressbalance.vertex_pairing=np.vstack((np.vstack((posx+1,posx2+1)).T,np.vstack((posy+1,posy2+1)).T))
 
         #Add spc on the corners
-        pos=numpy.nonzero(logical_and_n(numpy.logical_or(md.mesh.x==0.,md.mesh.x==L),numpy.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbase))
+        pos=np.where(np.logical_and.reduce((np.logical_or(md.mesh.x==0.,md.mesh.x==L),np.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbase)))
         md.stressbalance.spcvx[pos]=0.
         md.stressbalance.spcvy[pos]=0.
@@ -71 +70 @@
         
         #Spc the bed at zero for vz
-        pos=numpy.nonzero(md.mesh.vertexonbase)
+        pos=np.where(md.mesh.vertexonbase)
         md.stressbalance.spcvz[pos]=0.
 
         #Compute the stressbalance
-        md.cluster=generic('name',oshostname(),'np',8)
+        md.cluster=generic('name',gethostname(),'np',8)
         md=solve(md,'Stressbalance')
 
@@ -83 +82 @@
         vz=md.results.StressbalanceSolution.Vz
         results.append(md.results.StressbalanceSolution)
-        minvx.append(numpy.min(vx[-md.mesh.numberofvertices2d:]))
-        maxvx.append(numpy.max(vx[-md.mesh.numberofvertices2d:]))
+        minvx.append(np.min(vx[-md.mesh.numberofvertices2d:]))
+        maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:]))
 
         #Now plot vx, vy, vz and vx on a cross section
@@ -91 +90 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipcHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               printmodel(['ismipcHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #               shutil.move("ismipcHOvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
 #       plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3)
@@ -97 +96 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipcHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               printmodel(['ismipcHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #               shutil.move("ismipcHOvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
 #       plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4)
@@ -103 +102 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipcHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               printmodel(['ismipcHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #               shutil.move("ismipcHOvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
 
@@ -133 +132 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipcHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               printmodel(['ismipcHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #               shutil.move("ismipcHOvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
 
 #Now plot the min and max values of vx for each size of the square
-#plot([5 10 20 40 80 160],minvx);ylim([4 18]);xlim([0 160])
+#plot([5 10 20 40 80 160],minvx)ylim([4 18])xlim([0 160])
 if printingflag:
         pass
 #       set(gcf,'Color','w')
-#       printmodel('ismipcHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#       printmodel('ismipcHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #       shutil.move('ismipcHOminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
-#plot([5 10 20 40 80 160],maxvx);ylim([0 200]); xlim([0 160])
+#plot([5 10 20 40 80 160],maxvx)ylim([0 200]) xlim([0 160])
 if printingflag:
         pass
 #       set(gcf,'Color','w')
-#       printmodel('ismipcHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#       printmodel('ismipcHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off')
 #       shutil.move('ismipcHOmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC')
 
 #Fields and tolerances to track changes
-field_names     =[\
-        'Vx5km','Vy5km','Vz5km',\
-        'Vx10km','Vy10km','Vz10km',\
-        'Vx20km','Vy20km','Vz20km',\
-        'Vx40km','Vy40km','Vz40km',\
-        'Vx80km','Vy80km','Vz80km',\
-        'Vx160km','Vy160km','Vz160km'
-]
-field_tolerances=[\
-        1e-08,1e-07,1e-07,\
-        1e-09,1e-07,1e-07,\
-        1e-09,1e-09,1e-07,\
-        1e-09,1e-09,1e-08,\
-        1e-09,1e-08,1e-08,\
-        1e-09,1e-08,1e-08,\
-]
+field_names     =['Vx80km','Vy80km','Vz80km']
+field_tolerances=[1e-09,1e-08,1e-08]
 field_values=[]
 for result in results:
-        field_values=field_values+[\
-                result.Vx,\
-                result.Vy,\
-                result.Vz,\
-                ]
+        field_values=field_values+[result.Vx,result.Vy,result.Vz]