Changeset 21729 for issm/trunk/test/NightlyRun/test338.py

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test338.py (modified) (4 diffs)

issm/trunk/test/NightlyRun/test338.py

@@ -1 +1 @@
 #Test Name: SquareSheetConstrainedSmbMeltComponents2d
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from triangle import *
 from setmask import *
@@ -7 +8 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
+
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
@@ -13 +14 @@
 md=parameterize(md,'../Par/SquareShelf.py')
 md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 
 md.timestepping.time_step=1.
 md.settings.output_frequency=1
-md.timestepping.final_time=4.
+md.timestepping.final_time=400.
 
 #Set up transient
-smb=numpy.ones((md.mesh.numberofvertices,1))*3.6
-smb=numpy.hstack((smb,smb*-1.))
+smb=np.ones((md.mesh.numberofvertices))*3.6
+smb=np.vstack((smb,smb*-1.)).T
 
-md.smb=SMBmeltcomponents();
-md.smb.accumulation=numpy.vstack((smb, [1.5,3.]));
-md.smb.evaporation=numpy.vstack((smb/2, [1.5,3.]));
-md.smb.melt=numpy.vstack((smb/2, [1.5,3.]));
-md.smb.refreeze=numpy.vstack((smb, [1.5,3.]));
+md.smb=SMBmeltcomponents()
+md.smb.accumulation=np.vstack((smb, [1.5,3.]))
+md.smb.evaporation=np.vstack((smb/2, [1.5,3.]))
+md.smb.melt=np.vstack((smb/2, [1.5,3.]))
+md.smb.refreeze=np.vstack((smb, [1.5,3.]))
 md.transient.isthermal=False
 
@@ -33 +34 @@
 
 #Fields and tolerances to track changes
-field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', \
-        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', \
-        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', \
-        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4']
-field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
-        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
-        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
-        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]
-field_values=[\
-        md.results.TransientSolution[0].Vx,\
-        md.results.TransientSolution[0].Vy,\
-        md.results.TransientSolution[0].Vel,\
-        md.results.TransientSolution[0].Pressure,\
-        md.results.TransientSolution[0].Base,\
-        md.results.TransientSolution[0].Surface,\
-        md.results.TransientSolution[0].Thickness,\
-        md.results.TransientSolution[0].SmbMassBalance,\
-        md.results.TransientSolution[1].Vx,\
-        md.results.TransientSolution[1].Vy,\
-        md.results.TransientSolution[1].Vel,\
-        md.results.TransientSolution[1].Pressure,\
-        md.results.TransientSolution[1].Base,\
-        md.results.TransientSolution[1].Surface,\
-        md.results.TransientSolution[1].Thickness,\
-        md.results.TransientSolution[1].SmbMassBalance,\
-        md.results.TransientSolution[2].Vx,\
-        md.results.TransientSolution[2].Vy,\
-        md.results.TransientSolution[2].Vel,\
-        md.results.TransientSolution[2].Pressure,\
-        md.results.TransientSolution[2].Base,\
-        md.results.TransientSolution[2].Surface,\
-        md.results.TransientSolution[2].Thickness,\
-        md.results.TransientSolution[2].SmbMassBalance,\
-        md.results.TransientSolution[3].Vx,\
-        md.results.TransientSolution[3].Vy,\
-        md.results.TransientSolution[3].Vel,\
-        md.results.TransientSolution[3].Pressure,\
-        md.results.TransientSolution[3].Base,\
-        md.results.TransientSolution[3].Surface,\
-        md.results.TransientSolution[3].Thickness,\
-        md.results.TransientSolution[3].SmbMassBalance,\
-        ]
+field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1',
+                                                 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2',
+                                                 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3',
+                                                 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4']
+field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,
+                                                                        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,
+                                                                        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,
+                                                                        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]
+field_values=[md.results.TransientSolution[0].Vx,
+                                                        md.results.TransientSolution[0].Vy,
+                                                        md.results.TransientSolution[0].Vel,
+                                                        md.results.TransientSolution[0].Pressure,
+                                                        md.results.TransientSolution[0].Base,
+                                                        md.results.TransientSolution[0].Surface,
+                                                        md.results.TransientSolution[0].Thickness,
+                                                        md.results.TransientSolution[0].SmbMassBalance,
+                                                        md.results.TransientSolution[1].Vx,
+                                                        md.results.TransientSolution[1].Vy,
+                                                        md.results.TransientSolution[1].Vel,
+                                                        md.results.TransientSolution[1].Pressure,
+                                                        md.results.TransientSolution[1].Base,
+                                                        md.results.TransientSolution[1].Surface,
+                                                        md.results.TransientSolution[1].Thickness,
+                                                        md.results.TransientSolution[1].SmbMassBalance,
+                                                        md.results.TransientSolution[2].Vx,
+                                                        md.results.TransientSolution[2].Vy,
+                                                        md.results.TransientSolution[2].Vel,
+                                                        md.results.TransientSolution[2].Pressure,
+                                                        md.results.TransientSolution[2].Base,
+                                                        md.results.TransientSolution[2].Surface,
+                                                        md.results.TransientSolution[2].Thickness,
+                                                        md.results.TransientSolution[2].SmbMassBalance,
+                                                        md.results.TransientSolution[3].Vx,
+                                                        md.results.TransientSolution[3].Vy,
+                                                        md.results.TransientSolution[3].Vel,
+                                                        md.results.TransientSolution[3].Pressure,
+                                                        md.results.TransientSolution[3].Base,
+                                                        md.results.TransientSolution[3].Surface,
+                                                        md.results.TransientSolution[3].Thickness,
+                                                        md.results.TransientSolution[3].SmbMassBalance]