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

issm/trunk/test/NightlyRun/test207.py

@@ -3 +3 @@
 from model import *
 from socket import gethostname
-import numpy as np
 from triangle import *
 from setmask import *
@@ -11 +10 @@
 from generic import generic
 
-md=triangle(model(),'../Exp/Square.exp',180000)
-md=setmask(md,'all','')
-md=parameterize(md,'../Par/SquareShelf.py')
-md.extrude(3,1.)
-md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',gethostname(),'np',3)
-md.transient.isstressbalance=False
-md.transient.ismasstransport=False
-md.transient.issmb=True
-md.transient.isthermal=True
-md.transient.isgroundingline=False
-md=solve(md,'Transient')
+md = triangle(model(), '../Exp/Square.exp', 180000)
+md = setmask(md, 'all', '')
+md = parameterize(md, '../Par/SquareShelf.py')
+md.extrude(3, 1.)
+md = setflowequation(md, 'SSA', 'all')
+md.cluster = generic('name', gethostname(), 'np', 3)
+md.transient.isstressbalance = False
+md.transient.ismasstransport = False
+md.transient.issmb = True
+md.transient.isthermal = True
+md.transient.isgroundingline = False
+md = solve(md, 'Transient')
 
 # Fields and tolerances to track changes
-field_names     =['Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3']
-field_tolerances=[1e-13,1e-6,1e-13,1e-6,1e-13,1e-6]
-field_values=[\
-        md.results.TransientSolution[0].Temperature,\
-        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
-        md.results.TransientSolution[1].Temperature,\
-        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
-        md.results.TransientSolution[2].Temperature,\
-        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
-        ]
+field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3']
+field_tolerances = [1e-13, 1e-6, 1e-13, 1e-6, 1e-13, 1e-6]
+field_values = [md.results.TransientSolution[0].Temperature,
+                md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,
+                md.results.TransientSolution[1].Temperature,
+                md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,
+                md.results.TransientSolution[2].Temperature,
+                md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate]