Index: ../trunk-jpl/test/NightlyRun/test331.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test331.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test331.py (revision 14542) @@ -0,0 +1,31 @@ +import numpy +import copy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000.) +md=setmask(md,'','') +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=solve(md,HydrologySolutionEnum()) + +#Fields and tolerances to track changes +field_names =['HydrologyWaterVx1','HydrologyWaterVy','WaterColumn'] +field_tolerances=[1e-09,1e-09,1e-09] +field_values=[\ + md.results.HydrologySolution.HydrologyWaterVx,\ + md.results.HydrologySolution.HydrologyWaterVy,\ + md.results.HydrologySolution.Watercolumn,\ + ] Index: ../trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14541) +++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14542) @@ -97,6 +97,7 @@ 327 : 'SquareSheetConstrainedTransP3dEnth', 328 : 'SquareSheetConstrainedSmbGradients2d', 329 : 'SquareSheetConstrainedSmbGradients3d', + 331 : 'SquareSheetConstrainedHydrology'; 401 : 'SquareSheetShelfDiagM2d', 402 : 'SquareSheetShelfDiagM3d', 403 : 'SquareSheetShelfDiagP3d',