Changeset 21729 for issm/trunk/test/NightlyRun/test1207.py

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test1207.py (modified) (8 diffs)

issm/trunk/test/NightlyRun/test1207.py

@@ -1 +1 @@
 #Test Name: EISMINTRoundIceSheetStaticFS
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from roundmesh import *
 from setmask import *
@@ -7 +8 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
+
 
 """
@@ -26 +27 @@
 #Calculation of the analytical 2d velocity field
 constant=0.3
-vx_obs=constant/2.*md.mesh.x.reshape(-1,1)*(md.geometry.thickness)**-1
-vy_obs=constant/2.*md.mesh.y.reshape(-1,1)*(md.geometry.thickness)**-1
-vel_obs=numpy.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2)
+vx_obs=constant/2.*md.mesh.x*(md.geometry.thickness)**-1
+vy_obs=constant/2.*md.mesh.y*(md.geometry.thickness)**-1
+vel_obs=np.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2)
 
 #We extrude the model to have a 3d model
@@ -35 +36 @@
 
 #Spc the nodes on the bed
-pos=numpy.nonzero(md.mesh.vertexonbase)
+pos=np.where(md.mesh.vertexonbase)
 md.stressbalance.spcvx[pos]=0.
 md.stressbalance.spcvy[pos]=0.
@@ -41 +42 @@
 
 #Now we can solve the problem 
-md.cluster=generic('name',oshostname(),'np',8)
+md.cluster=generic('name',gethostname(),'np',8)
 md=solve(md,'Stressbalance')
 
@@ -47 +48 @@
 vx=md.results.StressbalanceSolution.Vx
 vy=md.results.StressbalanceSolution.Vy
-vel=numpy.zeros((md.mesh.numberofvertices2d,1))
+vel=np.zeros((md.mesh.numberofvertices2d))
 
 for i in xrange(0,md.mesh.numberofvertices2d):
@@ -53 +54 @@
         for j in xrange(0,md.mesh.numberoflayers-1):
                 node_vel=node_vel+1./(2.*(md.mesh.numberoflayers-1))*\
-                        (numpy.sqrt(vx[i+(j+1)*md.mesh.numberofvertices2d,0]**2+vy[i+(j+1)*md.mesh.numberofvertices2d,0]**2)+\
-                        numpy.sqrt(vx[i+j*md.mesh.numberofvertices2d,0]**2+vy[i+j*md.mesh.numberofvertices2d,0]**2))
-        vel[i,0]=node_vel
+                        (np.sqrt(vx[i+(j+1)*md.mesh.numberofvertices2d,0]**2+vy[i+(j+1)*md.mesh.numberofvertices2d,0]**2)+\
+                        np.sqrt(vx[i+j*md.mesh.numberofvertices2d,0]**2+vy[i+j*md.mesh.numberofvertices2d,0]**2))
+        vel[i]=node_vel
 
 #Plot of the velocity from the exact and calculated solutions
@@ -61 +62 @@
 #subplot(2,2,1)
 #p=patch('Faces',md.mesh.elements2d,'Vertices',[md.mesh.x2d md.mesh.y2d],'FaceVertexCData',...
-#vel,'FaceColor','interp','EdgeColor','none');
+#vel,'FaceColor','interp','EdgeColor','none')
 #title('Modelled velocity','FontSize',14,'FontWeight','bold')
-#colorbar; 
-#caxis([0 200]);
+#colorbar 
+#caxis([0 200])
    
 #subplot(2,2,2)
 #p=patch('Faces',md.mesh.elements2d,'Vertices',[md.mesh.x2d md.mesh.y2d],'FaceVertexCData',...
-#vel_obs,'FaceColor','interp','EdgeColor','none');
+#vel_obs,'FaceColor','interp','EdgeColor','none')
 #title('Analytical velocity','FontSize',14,'FontWeight','bold')
-#colorbar; 
-#caxis([0 200]);
+#colorbar 
+#caxis([0 200])
 
 #subplot(2,2,3)
-#hold on;
-#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2+(md.mesh.y(1:md.mesh.numberofvertices2d)).^2),vel,'r.');
-#plot(sqrt((md.mesh.x2d).^2+(md.mesh.y2d).^2),vel_obs,'b.');
-#title('Analytical vs calculated velocity','FontSize',14,'FontWeight','bold');
-#xlabel('distance to the center of the icesheet [m]','FontSize',14,'FontWeight','bold');
-#ylabel('velocity [m/yr]','FontSize',14,'FontWeight','bold');
-#legend('calculated velocity','exact velocity');
-#axis([0 750000 0 200]);
-#hold off;
+#hold on
+#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2+(md.mesh.y(1:md.mesh.numberofvertices2d)).^2),vel,'r.')
+#plot(sqrt((md.mesh.x2d).^2+(md.mesh.y2d).^2),vel_obs,'b.')
+#title('Analytical vs calculated velocity','FontSize',14,'FontWeight','bold')
+#xlabel('distance to the center of the icesheet [m]','FontSize',14,'FontWeight','bold')
+#ylabel('velocity [m/yr]','FontSize',14,'FontWeight','bold')
+#legend('calculated velocity','exact velocity')
+#axis([0 750000 0 200])
+#hold off
 
 #subplot(2,2,4)
 #p=patch('Faces',md.mesh.elements2d,'Vertices',[md.mesh.x2d md.mesh.y2d],'FaceVertexCData',...
-#abs(vel-vel_obs)./vel_obs*100,'FaceColor','interp','EdgeColor','none');
+#abs(vel-vel_obs)./vel_obs*100,'FaceColor','interp','EdgeColor','none')
 #title('Relative misfit [%]','FontSize',14,'FontWeight','bold')
-#colorbar;
-#caxis([0 100]);
+#colorbar
+#caxis([0 100])
 
 if printingflag:
         pass
 #       set(gcf,'Color','w')
-#       printmodel('FSstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
-#       system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
+#       printmodel('FSstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off')
+#       system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet'])
 
 #Fields and tolerances to track changes
-field_names     =[ \
-        'Vx','Vy','Vel', \
-]
-field_tolerances=[ \
-        1e-12,1e-12,1e-12, \
-]
-field_values=[ \
-        vx,vy,vel, \
-]
+field_names     =['Vx','Vy','Vel']
+field_tolerances=[1e-12,1e-12,1e-12]
+field_values=[vx,vy,vel]