Changeset 24313 for issm/trunk/test/NightlyRun/test3009.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/test3009.py (modified) (1 diff)

issm/trunk/test/NightlyRun/test3009.py

@@ -7 +7 @@
 from setflowequation import *
 from solve import *
+from issmgslsolver import issmgslsolver
 
 
-md=triangle(model(),'../Exp/Square.exp',180000.)
-md=setmask(md,'all','')
-md=parameterize(md,'../Par/SquareShelfConstrained.py')
-md.extrude(3,1.)
-md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',gethostname(),'np',1)
-md.transient.isstressbalance=False
-md.transient.ismasstransport=False
-md.transient.issmb=True
-md.transient.isthermal=True
-md.transient.isgroundingline=False
-md.autodiff.isautodiff=True
-md=solve(md,'Transient')
+md = triangle(model(), '../Exp/Square.exp', 180000.)
+md = setmask(md, 'all', '')
+md = parameterize(md, '../Par/SquareShelfConstrained.py')
+md.extrude(3, 1.)
+md = setflowequation(md, 'SSA', 'all')
+md.cluster = generic('name', gethostname(), 'np', 1)
+md.transient.isstressbalance = False
+md.transient.ismasstransport = False
+md.transient.issmb = True
+md.transient.isthermal = True
+md.transient.isgroundingline = False
+md.autodiff.isautodiff = True
+md.toolkits.DefaultAnalysis = issmgslsolver()
+md = solve(md, 'Transient')
 
 #Fields and tolerances to track changes
-field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
-field_tolerances=[1e-13,1e-13]
-field_values=[\
-        md.results.TransientSolution[0].Temperature,\
-        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
-        ]
+field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate']
+field_tolerances = [1e-13, 1e-13]
+field_values = [md.results.TransientSolution[0].Temperature,
+                md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate]