Changeset 16137 for issm/trunk/test/NightlyRun/test1102.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/NightlyRun/test1102.py (modified) (5 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/test/NightlyRun/test1102.py

@@ -39 +39 @@
         md=parameterize(md,'../Par/ISMIPA.py')
         md.extrude(10,1.)
-        md=setflowequation(md,'stokes','all')
+        md=setflowequation(md,'FS','all')
 
         #Create dirichlet on the bed only
         pos=numpy.nonzero(md.mesh.vertexonbed)
-        md.diagnostic.spcvx[pos]=0.
-        md.diagnostic.spcvy[pos]=0.
-        md.diagnostic.spcvz[pos]=0.
+        md.stressbalance.spcvx[pos]=0.
+        md.stressbalance.spcvy[pos]=0.
+        md.stressbalance.spcvz[pos]=0.
 
 #       #Create MPCs to have periodic boundary conditions
@@ -56 +56 @@
 #       posy2=numpy.nonzero(logical_and_n(md.mesh.y==numpy.max(md.mesh.y),md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x),numpy.logical_not(md.mesh.vertexonbed)))[0]
 
-#       md.diagnostic.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=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))))
 
-        #Compute the diagnostic
-        md.diagnostic.abstol=float('NaN')
-        md.diagnostic.reltol=float('NaN')
-        md.diagnostic.restol=1.
+        #Compute the stressbalance
+        md.stressbalance.abstol=float('NaN')
+        md.stressbalance.reltol=float('NaN')
+        md.stressbalance.restol=1.
         md.cluster=generic('name',oshostname(),'np',8)
-        md=solve(md,DiagnosticSolutionEnum())
+        md=solve(md,StressbalanceSolutionEnum())
 
         #Plot the results and save them
-        vx=md.results.DiagnosticSolution.Vx
-        vy=md.results.DiagnosticSolution.Vy
-        vz=md.results.DiagnosticSolution.Vz
-        pressure=md.results.DiagnosticSolution.Pressure
-        results.append(md.results.DiagnosticSolution)
+        vx=md.results.StressbalanceSolution.Vx
+        vy=md.results.StressbalanceSolution.Vy
+        vz=md.results.StressbalanceSolution.Vz
+        pressure=md.results.StressbalanceSolution.Pressure
+        results.append(md.results.StressbalanceSolution)
         minvx.append(numpy.min(vx[-md.mesh.numberofvertices2d:]))
         maxvx.append(numpy.max(vx[-md.mesh.numberofvertices2d:]))
@@ -79 +79 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipastokesvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#               shutil.move("ismipastokesvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#               printmodel(['ismipaFSvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               shutil.move("ismipaFSvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 #       plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3)
         if printingflag:
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipastokesvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#               shutil.move("ismipastokesvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#               printmodel(['ismipaFSvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               shutil.move("ismipaFSvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 #       plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4)
         if printingflag:
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipastokesvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#               shutil.move("ismipastokesvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#               printmodel(['ismipaFSvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               shutil.move("ismipaFSvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 
         if   (L==5000.):
@@ -121 +121 @@
                 pass
 #               set(gcf,'Color','w')
-#               printmodel(['ismipastokesvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#               shutil.move("ismipastokesvxsec.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#               printmodel(['ismipaFSvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#               shutil.move("ismipaFSvxsec.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 
 #Now plot the min and max values of vx for each size of the square
@@ -129 +129 @@
         pass
 #       set(gcf,'Color','w')
-#       printmodel('ismipastokesminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#       shutil.move('ismipastokesminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#       printmodel('ismipaFSminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#       shutil.move('ismipaFSminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 #plot([5 10 20 40 80 160],maxvx);ylim([0 120])
 if printingflag:
         pass
 #       set(gcf,'Color','w')
-#       printmodel('ismipastokesmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
-#       shutil.move('ismipastokesmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
+#       printmodel('ismipaFSmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
+#       shutil.move('ismipaFSmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA')
 
 #Fields and tolerances to track changes

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad