Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17089) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17090) @@ -102,5 +102,4 @@ case 328, name='SquareSheetConstrainedSmbGradients2d'; case 329, name='SquareSheetConstrainedSmbGradients3d'; - case 331, name='SquareSheetConstrainedHydrologyShreve'; case 332, name='SquareSheetConstrainedHydrologyDC'; case 333, name='SquareSheetHydrologyDCTwoLayers'; @@ -171,5 +170,4 @@ case 610, name='79NorthBalThic3d'; case 611, name='79NorthCMBalThic2dCG'; - case 612, name='79NorthCMBalThic2dDG'; case 613, name='79NorthCMBalThicVxVy'; case 701, name='FlowbandFSshelf'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17089) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17090) @@ -104,5 +104,4 @@ 328 : 'SquareSheetConstrainedSmbGradients2d', 329 : 'SquareSheetConstrainedSmbGradients3d', - 331 : 'SquareSheetConstrainedHydrologyShreve', 332 : 'SquareSheetConstrainedHydrologyDC', 333 : 'SquareSheetHydrologyDCTwoLayers', @@ -171,5 +170,4 @@ 610 : '79NorthBalThic3d', 611 : '79NorthCMBalThic2dCG', - 612 : '79NorthCMBalThic2dDG', 613 : '79NorthCMBalThicVxVy', 1101 : 'ISMIPAHO', Index: sm/trunk-jpl/test/NightlyRun/test331.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test331.m (revision 17089) +++ (revision ) @@ -1,25 +1,0 @@ -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.initialization.watercolumn=10^-3*ones(md.mesh.numberofvertices,1); -md.hydrology.spcwatercolumn=NaN*ones(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==0 | md.mesh.x==0); -md.hydrology.spcwatercolumn(pos)=2*10^-3; -md=solve(md,HydrologySolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'HydrologyWaterVx1','HydrologyWaterVy1','WaterColumn1', 'HydrologyWaterVx2','HydrologyWaterVy2','WaterColumn2', 'HydrologyWaterVx3','HydrologyWaterVy3','WaterColumn3'}; -field_tolerances={1e-09,1e-01,1e-09, 1e-09,1e-01,1e-09, 1e-09,1e-01,1e-09}; -field_values={... - (md.results.HydrologySolution(1).HydrologyWaterVx),... - (md.results.HydrologySolution(1).HydrologyWaterVy),... - (md.results.HydrologySolution(1).Watercolumn),... - (md.results.HydrologySolution(2).HydrologyWaterVx),... - (md.results.HydrologySolution(2).HydrologyWaterVy),... - (md.results.HydrologySolution(2).Watercolumn),... - (md.results.HydrologySolution(3).HydrologyWaterVx),... - (md.results.HydrologySolution(3).HydrologyWaterVy),... - (md.results.HydrologySolution(3).Watercolumn),... - }; Index: sm/trunk-jpl/test/NightlyRun/test331.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test331.py (revision 17089) +++ (revision ) @@ -1,36 +1,0 @@ -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,'SSA','all') -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(numpy.logical_or(md.mesh.y==0.,md.mesh.x==0.))[0] -md.hydrology.spcwatercolumn[pos]=2e-3 -md=solve(md,HydrologySolutionEnum()) - -#Fields and tolerances to track changes -field_names =['HydrologyWaterVx1','HydrologyWaterVy1','WaterColumn1','HydrologyWaterVx2','HydrologyWaterVy2','WaterColumn2','HydrologyWaterVx3','HydrologyWaterVy3','WaterColumn3'] -field_tolerances=[1e-09,1e-01,1e-09,1e-09,1e-01,1e-09,1e-09,1e-01,1e-09] -field_values=[\ - md.results.HydrologySolution[0].HydrologyWaterVx,\ - md.results.HydrologySolution[0].HydrologyWaterVy,\ - md.results.HydrologySolution[0].Watercolumn,\ - md.results.HydrologySolution[1].HydrologyWaterVx,\ - md.results.HydrologySolution[1].HydrologyWaterVy,\ - md.results.HydrologySolution[1].Watercolumn,\ - md.results.HydrologySolution[2].HydrologyWaterVx,\ - md.results.HydrologySolution[2].HydrologyWaterVy,\ - md.results.HydrologySolution[2].Watercolumn,\ - ] Index: sm/trunk-jpl/test/NightlyRun/test612.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.m (revision 17089) +++ (revision ) @@ -1,32 +1,0 @@ -md=triangle(model(),'../Exp/79North.exp',10000.); -md=meshconvert(md); -md=setmask(md,'../Exp/79NorthShelf.exp',''); -md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'SSA','all'); - -%control parameters -md.inversion.nsteps=2; -md.balancethickness.stabilization=3; -md.inversion.iscontrol=1; -md.inversion.control_parameters={'BalancethicknessThickeningRate'}; -md.inversion.thickness_obs=md.geometry.thickness; -md.inversion.min_parameters=-50.*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=50.*ones(md.mesh.numberofvertices,1); -md.inversion.cost_functions=201; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10./md.constants.yts*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); - -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'Gradient','Misfits','BalancethicknessThickeningRate','Thickness'}; -field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; -field_values={... - (md.results.BalancethicknessSolution.Gradient1),... - md.results.BalancethicknessSolution.J,... - (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... - (md.results.BalancethicknessSolution.Thickness) -}; Index: sm/trunk-jpl/test/NightlyRun/test612.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.py (revision 17089) +++ (revision ) @@ -1,43 +1,0 @@ -import numpy -from model import * -from EnumDefinitions import * -from MatlabFuncs import * -from triangle import * -from meshconvert import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * - -md=triangle(model(),'../Exp/79North.exp',10000.) -md=meshconvert(md) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') - -#control parameters -md.inversion.nsteps=2 -md.balancethickness.stabilization=3 -md.inversion.iscontrol=1 -md.inversion.control_parameters=['BalancethicknessThickeningRate'] -md.inversion.thickness_obs=md.geometry.thickness -md.inversion.min_parameters=-50.*numpy.ones((md.mesh.numberofvertices,1)) -md.inversion.max_parameters=50.*numpy.ones((md.mesh.numberofvertices,1)) -md.inversion.cost_functions=[201] -md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1)) -md.inversion.gradient_scaling=10./md.constants.yts*numpy.ones((md.inversion.nsteps,1)) -md.inversion.maxiter_per_step=4*numpy.ones((md.inversion.nsteps,1)) -md.inversion.step_threshold=0.99*numpy.ones((md.inversion.nsteps,1)) - -md.cluster=generic('name',oshostname(),'np',3) -md=solve(md,BalancethicknessSolutionEnum()) - -#Fields and tolerances to track changes -field_names =['Gradient','Misfits','BalancethicknessThickeningRate','Thickness'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[\ - md.results.BalancethicknessSolution.Gradient1,\ - md.results.BalancethicknessSolution.J,\ - md.results.BalancethicknessSolution.BalancethicknessThickeningRate,\ - md.results.BalancethicknessSolution.Thickness -]