Changeset 24313 for issm/trunk/test/NightlyRun/test3001.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test3001.py (modified) (1 diff)

issm/trunk/test/NightlyRun/test3001.py

@@ -7 +7 @@
 from setflowequation import *
 from solve import *
+from issmgslsolver import issmgslsolver
 
 
-md=triangle(model(),'../Exp/Square.exp',50000.)
-md=setmask(md,'all','')
-md=parameterize(md,'../Par/SquareShelfConstrained.py')
-md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',gethostname(),'np',1)
-md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
-md.autodiff.isautodiff=True
-md=solve(md,'Stressbalance')
+md = triangle(model(), '../Exp/Square.exp', 50000.)
+md = setmask(md, 'all', '')
+md = parameterize(md, '../Par/SquareShelfConstrained.py')
+md = setflowequation(md, 'SSA', 'all')
+md.cluster = generic('name', gethostname(), 'np', 1)
+md.stressbalance.requested_outputs = ['default', 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy']
+md.autodiff.isautodiff = True
+md.toolkits.DefaultAnalysis = issmgslsolver()
+md = solve(md, 'Stressbalance')
 
 #Fields and tolerances to track changes
-field_names     =['Vx','Vy','Vel','Pressure',\
-        'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
-        1e-13,1e-13,1e-13]
-field_values=[\
-        md.results.StressbalanceSolution.Vx,\
-        md.results.StressbalanceSolution.Vy,\
-        md.results.StressbalanceSolution.Vel,\
-        md.results.StressbalanceSolution.Pressure,\
-        md.results.StressbalanceSolution.DeviatoricStressxx,\
-        md.results.StressbalanceSolution.DeviatoricStressyy,\
-        md.results.StressbalanceSolution.DeviatoricStressxy,\
-        ]
+field_names = ['Vx', 'Vy', 'Vel', 'Pressure',
+               'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy']
+field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13,
+                    1e-13, 1e-13, 1e-13]
+field_values = [md.results.StressbalanceSolution.Vx,
+                md.results.StressbalanceSolution.Vy,
+                md.results.StressbalanceSolution.Vel,
+                md.results.StressbalanceSolution.Pressure,
+                md.results.StressbalanceSolution.DeviatoricStressxx,
+                md.results.StressbalanceSolution.DeviatoricStressyy,
+                md.results.StressbalanceSolution.DeviatoricStressxy]