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

issm/trunk

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

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

issm/trunk/test/NightlyRun/test216.py

@@ -13 +13 @@
 md=meshprocessrifts(md,'../Exp/Square.exp')
 md=setmask(md,'all','')
-md=parameterize(md,'../Par/SquareShelf.py')
-md=setflowequation(md,'macayeal','all')
+md=parameterize(md,'../Par/SquareShelf2.py')
+md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
 
@@ -21 +21 @@
 md.rifts.riftstruct[0]['fill']=MelangeEnum()
 md.rifts.riftstruct[0]['fraction']=0
-md.diagnostic.rift_penalty_lock=2
-md.diagnostic.rift_penalty_threshold=0
+md.stressbalance.rift_penalty_lock=2
+md.stressbalance.rift_penalty_threshold=0
 md.rifts.riftstruct[0]['fractionincrement']=0.1
-md=solve(md,DiagnosticSolutionEnum())
+md=solve(md,StressbalanceSolutionEnum())
 
 # Fields and tolerances to track changes
 
 field_names     =['Vx','Vy','Vel','Pressure']
-field_tolerances=[1e-11,1e-11,1e-11,1e-11]
+field_tolerances=[2.5e-11,1.5e-11,1e-11,1.5e-11]
 field_values=[\
-        md.results.DiagnosticSolution.Vx,\
-        md.results.DiagnosticSolution.Vy,\
-        md.results.DiagnosticSolution.Vel,\
-        md.results.DiagnosticSolution.Pressure,\
+        md.results.StressbalanceSolution.Vx,\
+        md.results.StressbalanceSolution.Vy,\
+        md.results.StressbalanceSolution.Vel,\
+        md.results.StressbalanceSolution.Pressure,\
         ]

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