[15393] | 1 | Index: ../trunk-jpl/test/NightlyRun/test331.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/test/NightlyRun/test331.py (revision 0)
|
---|
| 4 | +++ ../trunk-jpl/test/NightlyRun/test331.py (revision 14542)
|
---|
| 5 | @@ -0,0 +1,31 @@
|
---|
| 6 | +import numpy
|
---|
| 7 | +import copy
|
---|
| 8 | +from model import *
|
---|
| 9 | +from triangle import *
|
---|
| 10 | +from setmask import *
|
---|
| 11 | +from parameterize import *
|
---|
| 12 | +from setflowequation import *
|
---|
| 13 | +from EnumDefinitions import *
|
---|
| 14 | +from solve import *
|
---|
| 15 | +from MatlabFuncs import *
|
---|
| 16 | +
|
---|
| 17 | +md=triangle(model(),'../Exp/Square.exp',150000.)
|
---|
| 18 | +md=setmask(md,'','')
|
---|
| 19 | +md=parameterize(md,'../Par/SquareSheetConstrained.py')
|
---|
| 20 | +md=setflowequation(md,'macayeal','all')
|
---|
| 21 | +md.surfaceforcings.issmbgradients=1
|
---|
| 22 | +md.initialization.watercolumn=10^-3*numpy.ones((md.mesh.numberofvertices,1))
|
---|
| 23 | +md.hydrology.spcwatercolumn=float('nan')*numpy.ones(md.mesh.numberofvertices,1)
|
---|
| 24 | +md.nodeonicefront[pos]=1
|
---|
| 25 | +md.hydrology.spcwatercolumn[pos]=2e-0-3
|
---|
| 26 | +md.cluster=generic('name',oshostname(),'np',3)
|
---|
| 27 | +md=solve(md,HydrologySolutionEnum())
|
---|
| 28 | +
|
---|
| 29 | +#Fields and tolerances to track changes
|
---|
| 30 | +field_names =['HydrologyWaterVx1','HydrologyWaterVy','WaterColumn']
|
---|
| 31 | +field_tolerances=[1e-09,1e-09,1e-09]
|
---|
| 32 | +field_values=[\
|
---|
| 33 | + md.results.HydrologySolution.HydrologyWaterVx,\
|
---|
| 34 | + md.results.HydrologySolution.HydrologyWaterVy,\
|
---|
| 35 | + md.results.HydrologySolution.Watercolumn,\
|
---|
| 36 | + ]
|
---|
| 37 | Index: ../trunk-jpl/test/NightlyRun/IdToName.py
|
---|
| 38 | ===================================================================
|
---|
| 39 | --- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14541)
|
---|
| 40 | +++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14542)
|
---|
| 41 | @@ -97,6 +97,7 @@
|
---|
| 42 | 327 : 'SquareSheetConstrainedTransP3dEnth',
|
---|
| 43 | 328 : 'SquareSheetConstrainedSmbGradients2d',
|
---|
| 44 | 329 : 'SquareSheetConstrainedSmbGradients3d',
|
---|
| 45 | + 331 : 'SquareSheetConstrainedHydrology';
|
---|
| 46 | 401 : 'SquareSheetShelfDiagM2d',
|
---|
| 47 | 402 : 'SquareSheetShelfDiagM3d',
|
---|
| 48 | 403 : 'SquareSheetShelfDiagP3d',
|
---|