Changeset 14557

Timestamp:

04/12/13 09:24:46 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed python test331

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test331.m (modified) (1 diff)
• test331.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test331.m

@@ -14 +14 @@
 field_tolerances={1e-09,1e-09,1e-09};
 field_values={...
-        (md.results.HydrologySolution.HydrologyWaterVx),...
-        (md.results.HydrologySolution.HydrologyWaterVy),...
-        (md.results.HydrologySolution.Watercolumn),...
+        (md.results.HydrologySolution(1).HydrologyWaterVx),...
+        (md.results.HydrologySolution(1).HydrologyWaterVy),...
+        (md.results.HydrologySolution(1).Watercolumn),...
         };

issm/trunk-jpl/test/NightlyRun/test331.py

@@ -14 +14 @@
 md=parameterize(md,'../Par/SquareSheetConstrained.py')
 md=setflowequation(md,'macayeal','all')
-md.surfaceforcings.issmbgradients=1
-md.initialization.watercolumn=10^-3*numpy.ones((md.mesh.numberofvertices,1))
-md.hydrology.spcwatercolumn=float('nan')*numpy.ones(md.mesh.numberofvertices,1)
-md.nodeonicefront[pos]=1 
-md.hydrology.spcwatercolumn[pos]=2e-0-3
 md.cluster=generic('name',oshostname(),'np',3)
+md.initialization.watercolumn=1e-3*numpy.ones((md.mesh.numberofvertices,1))
+md.hydrology.spcwatercolumn=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+pos=numpy.nonzero(md.mesh.y==0)[0]
+md.hydrology.spcwatercolumn[pos]=2e-3
 md=solve(md,HydrologySolutionEnum())
 
@@ -26 +25 @@
 field_tolerances=[1e-09,1e-09,1e-09]
 field_values=[\
-        md.results.HydrologySolution.HydrologyWaterVx,\
-        md.results.HydrologySolution.HydrologyWaterVy,\
-        md.results.HydrologySolution.Watercolumn,\
+        md.results.HydrologySolution[0].HydrologyWaterVx,\
+        md.results.HydrologySolution[0].HydrologyWaterVy,\
+        md.results.HydrologySolution[0].Watercolumn,\
         ]