Changeset 20500 for issm/trunk/test/NightlyRun/test329.py

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/NightlyRun/test329.py (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/test/NightlyRun/test329.py

@@ -16 +16 @@
 md.extrude(3,1)
 md=setflowequation(md,'HO','all')
-md.surfaceforcings = SMBgradients();
-md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
-md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
-md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
+md.smb = SMBgradients();
+md.smb.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
+md.smb.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
+md.smb.href=copy.deepcopy(md.geometry.surface).reshape(-1)
+md.smb.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=['default','TotalSmb']
 md.cluster=generic('name',oshostname(),'np',3)
@@ -39 +39 @@
         md.results.TransientSolution[0].Thickness,\
         md.results.TransientSolution[0].Temperature,\
-        md.results.TransientSolution[0].SurfaceforcingsMassBalance,\
+        md.results.TransientSolution[0].SmbMassBalance,\
         md.results.TransientSolution[0].TotalSmb,\
         md.results.TransientSolution[1].Vx,\
@@ -49 +49 @@
         md.results.TransientSolution[1].Thickness,\
         md.results.TransientSolution[1].Temperature,\
-        md.results.TransientSolution[1].SurfaceforcingsMassBalance,\
+        md.results.TransientSolution[1].SmbMassBalance,\
         md.results.TransientSolution[1].TotalSmb,\
         md.results.TransientSolution[2].Vx,\
@@ -59 +59 @@
         md.results.TransientSolution[2].Thickness,\
         md.results.TransientSolution[2].Temperature,\
-        md.results.TransientSolution[2].SurfaceforcingsMassBalance,\
+        md.results.TransientSolution[2].SmbMassBalance,\
         md.results.TransientSolution[2].TotalSmb,\
         ]

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad