Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12806) @@ -141,17 +141,17 @@ case 515, name='PigTherTranSUPG'; case 516, name='PigTherSteaSUPG'; - case 602, name='79NorthProg2d'; - case 604, name='79NorthProg2dDG'; - case 606, name='79NorthProg3d'; - case 608, name='79NorthSurfSlop2d'; - case 610, name='79NorthSurfSlop3d'; - case 612, name='79NorthBedSlop2d'; - case 614, name='79NorthBedSlop3d'; - case 616, name='79NorthBalThic2d'; - case 618, name='79NorthBalThic2dDG'; - case 620, name='79NorthBalThic3d'; - case 622, name='79NorthCMBalThic2dCG'; - case 624, name='79NorthCMBalThic2dDG'; - case 626, name='79NorthCMBalThicVxVyParalle'; + case 601, name='79NorthProg2d'; + case 602, name='79NorthProg2dDG'; + case 603, name='79NorthProg3d'; + case 604, name='79NorthSurfSlop2d'; + case 605, name='79NorthSurfSlop3d'; + case 606, name='79NorthBedSlop2d'; + case 607, name='79NorthBedSlop3d'; + case 608, name='79NorthBalThic2d'; + case 609, name='79NorthBalThic2dDG'; + case 610, name='79NorthBalThic3d'; + case 611, name='79NorthCMBalThic2dCG'; + case 612, name='79NorthCMBalThic2dDG'; + case 613, name='79NorthCMBalThicVxVyParalle'; case 1101, name='ISMIPAPattyn'; case 1102, name='ISMIPAStokes'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12806) @@ -143,17 +143,17 @@ 515 : 'PigTherTranSUPG', 516 : 'PigTherSteaSUPG', - 602 : '79NorthProg2d', - 604 : '79NorthProg2dDG', - 606 : '79NorthProg3d', - 608 : '79NorthSurfSlop2d', - 610 : '79NorthSurfSlop3d', - 612 : '79NorthBedSlop2d', - 614 : '79NorthBedSlop3d', - 616 : '79NorthBalThic2d', - 618 : '79NorthBalThic2dDG', - 620 : '79NorthBalThic3d', - 622 : '79NorthCMBalThic2dCG', - 624 : '79NorthCMBalThic2dDG', - 626 : '79NorthCMBalThicVxVy', + 601 : '79NorthProg2d', + 602 : '79NorthProg2dDG', + 603 : '79NorthProg3d', + 604 : '79NorthSurfSlop2d', + 605 : '79NorthSurfSlop3d', + 606 : '79NorthBedSlop2d', + 607 : '79NorthBedSlop3d', + 608 : '79NorthBalThic2d', + 609 : '79NorthBalThic2dDG', + 610 : '79NorthBalThic3d', + 611 : '79NorthCMBalThic2dCG', + 612 : '79NorthCMBalThic2dDG', + 613 : '79NorthCMBalThicVxVy', 1101 : 'ISMIPAPattyn', 1102 : 'ISMIPAStokes', Index: /issm/trunk-jpl/test/NightlyRun/test601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test601.m (revision 12806) @@ -0,0 +1,13 @@ +md=triangle(model,'../Exp/79North.exp',10000); +md=setmask(md,'../Exp/79NorthShelf.exp',''); +md=parameterize(md,'../Par/79North.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test602.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test602.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test602.m (revision 12806) @@ -1,6 +1,9 @@ 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,'macayeal','all'); +md.prognostic.stabilization=3; +md.prognostic.spcthickness=md.geometry.thickness; md.cluster=generic('name',oshostname(),'np',3); md=solve(md,PrognosticSolutionEnum); Index: /issm/trunk-jpl/test/NightlyRun/test603.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test603.m (revision 12806) @@ -0,0 +1,14 @@ +md=triangle(model,'../Exp/79North.exp',10000); +md=setmask(md,'../Exp/79NorthShelf.exp',''); +md=parameterize(md,'../Par/79North.par'); +md=extrude(md,6,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test604.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test604.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test604.m (revision 12806) @@ -1,16 +1,14 @@ 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,'macayeal','all'); -md.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,SurfaceSlopeSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; +field_tolerances={1e-13,1e-13}; field_values={... - (md.results.PrognosticSolution.Thickness),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... }; Index: /issm/trunk-jpl/test/NightlyRun/test605.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test605.m (revision 12806) @@ -0,0 +1,15 @@ +md=triangle(model,'../Exp/79North.exp',10000); +md=setmask(md,'../Exp/79NorthShelf.exp',''); +md=parameterize(md,'../Par/79North.par'); +md=extrude(md,5,1.5); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,SurfaceSlopeSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; +field_tolerances={1e-13,1e-13}; +field_values={... + (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test606.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test606.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test606.m (revision 12806) @@ -2,13 +2,13 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=extrude(md,6,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,BedSlopeSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'BedSlopeX','BedSlopeY'}; +field_tolerances={1e-13,1e-13}; field_values={... - (md.results.PrognosticSolution.Thickness),... + (md.results.BedSlopeSolution.BedSlopeX),... + (md.results.BedSlopeSolution.BedSlopeY),... }; Index: /issm/trunk-jpl/test/NightlyRun/test607.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test607.m (revision 12806) @@ -0,0 +1,15 @@ +md=triangle(model,'../Exp/79North.exp',10000); +md=setmask(md,'../Exp/79NorthShelf.exp',''); +md=parameterize(md,'../Par/79North.par'); +md=extrude(md,2,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,BedSlopeSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'BedSlopeX','BedSlopeY'}; +field_tolerances={1e-13,1e-13}; +field_values={... + (md.results.BedSlopeSolution.BedSlopeX),... + (md.results.BedSlopeSolution.BedSlopeY),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test608.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test608.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test608.m (revision 12806) @@ -4,11 +4,10 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum); %Fields and tolerances to track changes -field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... - (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk-jpl/test/NightlyRun/test609.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test609.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test609.m (revision 12806) @@ -0,0 +1,15 @@ +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,'macayeal','all'); +md.balancethickness.stabilization=3; +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,BalancethicknessSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.BalancethicknessSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test610.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test610.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test610.m (revision 12806) @@ -2,14 +2,13 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=extrude(md,5,1.5); -md=setflowequation(md,'pattyn','all'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum); %Fields and tolerances to track changes -field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... - (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk-jpl/test/NightlyRun/test611.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test611.m (revision 12806) @@ -0,0 +1,31 @@ +md=triangle(model,'../Exp/79North.exp',10000); +md=setmask(md,'../Exp/79NorthShelf.exp',''); +md=parameterize(md,'../Par/79North.par'); +md=setflowequation(md,'macayeal','all'); + +%control parameters +md.inversion.nsteps=2; +md.prognostic.stabilization=1; +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*ones(md.inversion.nsteps,1); +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: /issm/trunk-jpl/test/NightlyRun/test612.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test612.m (revision 12806) @@ -1,14 +1,32 @@ 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,'macayeal','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*ones(md.inversion.nsteps,1); +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,BedSlopeSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum); %Fields and tolerances to track changes -field_names ={'BedSlopeX','BedSlopeY'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; +field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; field_values={... - (md.results.BedSlopeSolution.BedSlopeX),... - (md.results.BedSlopeSolution.BedSlopeY),... - }; + (md.results.BalancethicknessSolution.Gradient1),... + md.results.BalancethicknessSolution.J,... + (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... + (md.results.BalancethicknessSolution.Thickness) +}; Index: /issm/trunk-jpl/test/NightlyRun/test613.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.m (revision 12806) +++ /issm/trunk-jpl/test/NightlyRun/test613.m (revision 12806) @@ -0,0 +1,41 @@ +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,'macayeal','all'); + +%Ice sheet only +md=modelextract(md,md.mask.elementongroundedice); +pos=find(md.mesh.vertexonboundary); +md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); + +%control parameters +md.inversion.thickness_obs=md.geometry.thickness; +md.inversion.iscontrol=1; +md.inversion.thickness_obs=md.geometry.thickness; +md.inversion.nsteps=2; +md.inversion.control_parameters={'Vx' 'Vy'}; +md.balancethickness.stabilization=1; +md.inversion.gradient_scaling=[10/md.constants.yts*ones(md.inversion.nsteps,1) 10/md.constants.yts*ones(md.inversion.nsteps,1)]; +md.inversion.min_parameters=[-2000*ones(md.mesh.numberofvertices,1) -2000*ones(md.mesh.numberofvertices,1)]; +md.inversion.max_parameters=[+2000*ones(md.mesh.numberofvertices,1) +2000*ones(md.mesh.numberofvertices,1)]; +md.inversion.cost_functions=201*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1); +md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); + +md.verbose.control=1; +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,BalancethicknessSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'}; +field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; +field_values={... + (md.results.BalancethicknessSolution.Gradient1),... + (md.results.BalancethicknessSolution.Gradient2),... + md.results.BalancethicknessSolution.J,... + (md.results.BalancethicknessSolution.Vx),... + (md.results.BalancethicknessSolution.Vy),... + (md.results.BalancethicknessSolution.Thickness) +}; Index: sm/trunk-jpl/test/NightlyRun/test614.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test614.m (revision 12805) +++ (revision ) @@ -1,15 +1,0 @@ -md=triangle(model,'../Exp/79North.exp',10000); -md=setmask(md,'../Exp/79NorthShelf.exp',''); -md=parameterize(md,'../Par/79North.par'); -md=extrude(md,2,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BedSlopeSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'BedSlopeX','BedSlopeY'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.BedSlopeSolution.BedSlopeX),... - (md.results.BedSlopeSolution.BedSlopeY),... - }; Index: sm/trunk-jpl/test/NightlyRun/test616.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test616.m (revision 12805) +++ (revision ) @@ -1,13 +1,0 @@ -md=triangle(model,'../Exp/79North.exp',10000); -md=setmask(md,'../Exp/79NorthShelf.exp',''); -md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test618.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test618.m (revision 12805) +++ (revision ) @@ -1,15 +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,'macayeal','all'); -md.balancethickness.stabilization=3; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test620.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test620.m (revision 12805) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/79North.exp',10000); -md=setmask(md,'../Exp/79NorthShelf.exp',''); -md=parameterize(md,'../Par/79North.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test622.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test622.m (revision 12805) +++ (revision ) @@ -1,31 +1,0 @@ -md=triangle(model,'../Exp/79North.exp',10000); -md=setmask(md,'../Exp/79NorthShelf.exp',''); -md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.nsteps=2; -md.prognostic.stabilization=1; -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*ones(md.inversion.nsteps,1); -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/test624.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test624.m (revision 12805) +++ (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,'macayeal','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*ones(md.inversion.nsteps,1); -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/test626.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test626.m (revision 12805) +++ (revision ) @@ -1,41 +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,'macayeal','all'); - -%Ice sheet only -md=modelextract(md,md.mask.elementongroundedice); -pos=find(md.mesh.vertexonboundary); -md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); - -%control parameters -md.inversion.thickness_obs=md.geometry.thickness; -md.inversion.iscontrol=1; -md.inversion.thickness_obs=md.geometry.thickness; -md.inversion.nsteps=2; -md.inversion.control_parameters={'Vx' 'Vy'}; -md.balancethickness.stabilization=1; -md.inversion.gradient_scaling=[10/md.constants.yts*ones(md.inversion.nsteps,1) 10/md.constants.yts*ones(md.inversion.nsteps,1)]; -md.inversion.min_parameters=[-2000*ones(md.mesh.numberofvertices,1) -2000*ones(md.mesh.numberofvertices,1)]; -md.inversion.max_parameters=[+2000*ones(md.mesh.numberofvertices,1) +2000*ones(md.mesh.numberofvertices,1)]; -md.inversion.cost_functions=201*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); - -md.verbose.control=1; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'}; -field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; -field_values={... - (md.results.BalancethicknessSolution.Gradient1),... - (md.results.BalancethicknessSolution.Gradient2),... - md.results.BalancethicknessSolution.J,... - (md.results.BalancethicknessSolution.Vx),... - (md.results.BalancethicknessSolution.Vy),... - (md.results.BalancethicknessSolution.Thickness) -};