Changeset 16137 for issm/trunk/test/NightlyRun/test1206.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/test1206.py (modified) (3 diffs)

issm/trunk

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

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

issm/trunk/test/NightlyRun/test1206.py

@@ -10 +10 @@
 
 """
-The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
+The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
 """
 
@@ -32 +32 @@
 #We extrude the model to have a 3d model
 md.extrude(numlayers,1.)
-md=setflowequation(md,'pattyn','all')
+md=setflowequation(md,'HO','all')
 
 #Spc the nodes on the bed
 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.
 
 #Now we can solve the problem 
 md.cluster=generic('name',oshostname(),'np',8)
-md=solve(md,DiagnosticSolutionEnum())
+md=solve(md,StressbalanceSolutionEnum())
 
 #Calculate the depth averaged velocity field (2d):
-vx=md.results.DiagnosticSolution.Vx
-vy=md.results.DiagnosticSolution.Vy
+vx=md.results.StressbalanceSolution.Vx
+vy=md.results.StressbalanceSolution.Vy
 vel=numpy.zeros((md.mesh.numberofvertices2d,1))
 
@@ -94 +94 @@
         pass
 #       set(gcf,'Color','w')
-#       printmodel('pattynstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
-#       system(['mv pattynstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
+#       printmodel('HOstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
+#       system(['mv HOstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
 
 #Fields and tolerances to track changes

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