Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test126.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test126.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test126.py

@@ -1 +1 @@
 #Test Name: SquareShelfConstrainedRestartTranHO3d
 from model import *
+from socket import gethostname
 from triangle import *
 from setmask import *
@@ -6 +7 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
+
 from massfluxatgate import massfluxatgate
 from generic import generic
@@ -14 +15 @@
 md=setmask(md,'all','')
 md=parameterize(md,'../Par/SquareShelfConstrained.py')
-md.cluster=generic('name',oshostname(),'np',1)
+md.cluster=generic('name',gethostname(),'np',1)
 md.transient.requested_outputs=['IceVolume','TotalSmb']
 md.extrude(3,1.)
 md=setflowequation(md,'HO','all')
 
-md.verbose=verbose('solution',1);
+md.verbose=verbose('solution',1)
 md.settings.recording_frequency=5
 
@@ -30 +31 @@
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Temperature1','Pressure1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Temperature2','Pressure2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3','Temperature3','Pressure3'];
+field_names     =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Temperature1','Pressure1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Temperature2','Pressure2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3','Temperature3','Pressure3']
 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
                 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\