Index: sm/trunk-jpl/test/NightlyRun/test101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test103.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test103.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test105.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test105.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test107.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test107.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,2); -md.cluster=none; -md=setflowequation(md,'stokes','all'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test109.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test109.m (revision 12026) +++ (revision ) @@ -1,13 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test113.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.m (revision 12026) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md=extrude(md,5,3); -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test115.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; -md.cluster=none; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test117.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test117.m (revision 12026) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test119.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test119.m (revision 12026) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - - - - - - - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test121.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test121.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test123.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test123.m (revision 12026) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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: sm/trunk-jpl/test/NightlyRun/test125.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test125.m (revision 12026) +++ (revision ) @@ -1,15 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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: sm/trunk-jpl/test/NightlyRun/test127.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test127.m (revision 12026) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test129.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test129.m (revision 12026) +++ (revision ) @@ -1,15 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test131.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test131.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -%Add boundary conditions on thickness on the border -pos=find(md.mesh.vertexonboundary); -md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test133.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test133.m (revision 12026) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -%Add boundary conditions on thickness on the border -pos=find(md.mesh.vertexonboundary); -md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test135.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test135.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md.balancethickness.stabilization=3; -md.initialization.vy=md.initialization.vy+400; -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test137.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test137.m (revision 12026) +++ (revision ) @@ -1,25 +1,0 @@ - -%Simple mesh -md=bamg(model,'domain','../Exp/Square.exp','hmax',100000); -x1=md.mesh.x; -y1=md.mesh.y; - -%hVertices -md=bamg(model,'domain','../Exp/Square.exp','hmax',300000,'hvertices',[10000 100000 400000 100000]'); -x2=md.mesh.x; -y2=md.mesh.y; - -%big mesh -t0=clock; -md=bamg(model,'domain','../Exp/Square.exp','hmax',3000); -nbelements=md.mesh.numberofelements; -elapsedtime=etime(clock,t0); - -%Fields and tolerances to track changes -field_names ={'x1' 'y1' 'x2' 'y2' 'nbelements' 'elapsed time'}; -field_tolerances={1e-13 1e-13 1e-13 1e-13 1e-13 0.5}; -field_values={... - x1, y1,... - x2, y2,... - nbelements,elapsedtime... - }; Index: sm/trunk-jpl/test/NightlyRun/test139.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test139.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; -md.cluster=none; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,EnthalpySolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy','Waterfraction','Temperature'}; -field_tolerances={1e-13,1e-10,1e-13}; -field_values={... - (md.results.EnthalpySolution.Enthalpy),... - (md.results.EnthalpySolution.Waterfraction),... - (md.results.EnthalpySolution.Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test141.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test141.m (revision 12026) +++ (revision ) @@ -1,30 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md.thermal.isenthalpy=1; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy1','Waterfraction1','Temperature1',... - 'Enthalpy2','Waterfraction2','Temperature2',... - 'Enthalpy3','Waterfraction3','Temperature3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Enthalpy),... - (md.results.TransientSolution(1).Waterfraction),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(2).Enthalpy),... - (md.results.TransientSolution(2).Waterfraction),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(3).Enthalpy),... - (md.results.TransientSolution(3).Waterfraction),... - (md.results.TransientSolution(3).Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test143.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test143.m (revision 12026) +++ (revision ) @@ -1,53 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.thermal.isenthalpy=1; -md.thermal.stabilization=2; -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).Enthalpy),... - (md.results.TransientSolution(1).Waterfraction),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).Enthalpy),... - (md.results.TransientSolution(2).Waterfraction),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).Enthalpy),... - (md.results.TransientSolution(3).Waterfraction),... - }; Index: sm/trunk-jpl/test/NightlyRun/test201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test203.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test203.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test205.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test205.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test207.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test207.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md.cluster=none; -md=setflowequation(md,'stokes','all'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test209.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','penalties'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test211.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; -md.cluster=none; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test213.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.m (revision 12026) +++ (revision ) @@ -1,23 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test215.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.m (revision 12026) +++ (revision ) @@ -1,33 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test217.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test219.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test219.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test221.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.m (revision 12026) +++ (revision ) @@ -1,48 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md.diagnostic.reltol=NaN; -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... - 1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... - 1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test223.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.m (revision 12026) +++ (revision ) @@ -1,33 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyBbar),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test225.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test227.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test229.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test233.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.m (revision 12026) +++ (revision ) @@ -1,69 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%redo the parameter file for this special shelf. -%constant thickness, constrained (vy=0) flow into an icefront, -%from 0 m/yr at the grounding line. - -%tighten -md.diagnostic.restol=10^-4; - -%needed later -ymin=min(md.mesh.y); -ymax=max(md.mesh.y); -xmin=min(md.mesh.x); -xmax=max(md.mesh.x); - -di=md.materials.rho_ice/md.materials.rho_water; - -h=1000; -md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; - -%Initial velocity and pressure -md.initialization.vx=zeros(md.mesh.numberofvertices,1); -md.initialization.vy=zeros(md.mesh.numberofvertices,1); -md.initialization.vz=zeros(md.mesh.numberofvertices,1); -md.initialization.pressure=zeros(md.mesh.numberofvertices,1); - -%Materials -md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); -md.materials.rheology_B=paterson(md.initialization.temperature); -md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); - -%Boundary conditions: -md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - -%constrain flanks to 0 normal velocity -pos=find(md.mesh.x==xmin | md.mesh.x==xmax); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvz(pos)=NaN; - -%constrain grounding line to 0 velocity -pos=find(md.mesh.y==ymin); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvy(pos)=0; - -%icefront -nodeonicefront=zeros(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; -pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); -diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; -md.diagnostic.icefront=diagnostic.icefront; - -md=solve(md,DiagnosticSolutionEnum); - -%create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292. -%ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3; -%vy_c=ey_c.*md.mesh.y*md.constants.yts; - -%Fields and tolerances to track changes -field_names ={'Vy'}; -field_tolerances={1e-13}; -field_values={(md.results.DiagnosticSolution.Vy)}; Index: sm/trunk-jpl/test/NightlyRun/test235.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.m (revision 12026) +++ (revision ) @@ -1,92 +1,0 @@ -md=squaremesh(model,1000000,1000000,5,5); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%redo the parameter file for this special shelf. -%constant thickness, constrained (vy=0) flow into an icefront, -%from 0 m/yr at the grounding line. - -%needed later -ymin=min(md.mesh.y); -ymax=max(md.mesh.y); -xmin=min(md.mesh.x); -xmax=max(md.mesh.x); - -di=md.materials.rho_ice/md.materials.rho_water; - -h=1000; -md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; - -%Initial velocity and pressure -md.initialization.vx=zeros(md.mesh.numberofvertices,1); -md.initialization.vy=zeros(md.mesh.numberofvertices,1); -md.initialization.vz=zeros(md.mesh.numberofvertices,1); -md.initialization.pressure=zeros(md.mesh.numberofvertices,1); - -%Materials -md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); -md.materials.rheology_B=paterson(md.initialization.temperature); -md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); - -%Boundary conditions: -md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - -%constrain flanks to 0 normal velocity -pos=find(md.mesh.x==xmin | md.mesh.x==xmax); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvz(pos)=NaN; - -%constrain grounding line to 0 velocity -pos=find(md.mesh.y==ymin); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvy(pos)=0; - -%icefront -nodeonicefront=zeros(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; -pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); -diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; -md.diagnostic.icefront=diagnostic.icefront; - -%partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; - -%Dakota options -%variables -md.qmu.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.5); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - -%imperative! -md.diagnostic.reltol=10^-10; %tighten for qmu analysese -md.qmu.isdakota=1; - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); - -%Fields and tolerances to track changes -md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test237.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test239.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test239.m (revision 12026) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',120000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test241.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test241.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',120000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,2,1); -md.diagnostic.viscosity_overshoot=0.0; -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test243.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test245.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.m (revision 12026) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; -md.cluster=none; -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test247.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test247.m (revision 12026) +++ (revision ) @@ -1,46 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test249.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test249.m (revision 12026) +++ (revision ) @@ -1,47 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; -md.cluster=none; -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test251.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test251.m (revision 12026) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test253.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test253.m (revision 12026) +++ (revision ) @@ -1,49 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test255.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test255.m (revision 12026) +++ (revision ) @@ -1,64 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; -field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test257.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test257.m (revision 12026) +++ (revision ) @@ -1,64 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; -field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test259.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test259.m (revision 12026) +++ (revision ) @@ -1,69 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test261.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test261.m (revision 12026) +++ (revision ) @@ -1,69 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test263.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test263.m (revision 12026) +++ (revision ) @@ -1,28 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5, md.thermal.spctemperature+10, md.thermal.spctemperature+15; 1.5 2.5 3.5 4]; -md.timestepping.time_step=1; -md.timestepping.final_time=4; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - (md.results.TransientSolution(4).Temperature),... - (md.results.TransientSolution(4).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test265.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test265.m (revision 12026) +++ (revision ) @@ -1,62 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5; 1 2]; -md.timestepping.time_step=0.5; -md.timestepping.final_time=2; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).Temperature),... - (md.results.TransientSolution(4).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test267.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test267.m (revision 12026) +++ (revision ) @@ -1,72 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; -%Dakota options - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; - -%variables -md.qmu.variables.surface_mass_balance=normal_uncertain('scaled_SurfaceforcingsMassBalance',1,0.1); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%mass flux profiles -md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'}; -md.qmu.mass_flux_profile_directory=pwd; - -%% nond_sampling study -md.qmu.method=dakota_method('nond_samp'); -md.qmu.method(end)=dmeth_params_set(md.qmu.method(end),'seed',1234,'samples',20,'sample_type','lhs'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver=''; -md.qmu.params.analysis_components=''; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; -md.qmu.isdakota=1; - -md.diagnostic.reltol=10^-5; %tighten for qmu analyses -md.transient.requested_outputs=IceVolumeEnum(); - -%solve -md=solve(md,TransientSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%Fields and tolerances to track changes -md.results.dakota.importancefactors=[]; -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).mean]; -end -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).stddev]; -end -field_names ={'importancefactors'}; -field_tolerances={1e-11}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test301.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test301.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test303.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test303.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test305.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test305.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test307.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test307.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test309.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test309.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,5,2); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test311.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test311.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,4,2); -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test313.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test313.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test315.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md.cluster=none; -md=setflowequation(md,'stokes','all'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test317.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.m (revision 12026) +++ (revision ) @@ -1,13 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test319.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test321.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test321.m (revision 12026) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md=extrude(md,5,0.5); -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test323.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; -md.cluster=none; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test325.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test325.m (revision 12026) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test327.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.m (revision 12026) +++ (revision ) @@ -1,37 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1',... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2',... - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test329.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.m (revision 12026) +++ (revision ) @@ -1,47 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,5,1.2); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test331.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test331.m (revision 12026) +++ (revision ) @@ -1,33 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test333.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.m (revision 12026) +++ (revision ) @@ -1,47 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test335.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.m (revision 12026) +++ (revision ) @@ -1,23 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,4,1); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; - -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test337.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test337.m (revision 12026) +++ (revision ) @@ -1,33 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=0*2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test339.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test339.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test341.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test341.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[102*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test343.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test343.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[104*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test345.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test345.m (revision 12026) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.timestepping.time_adapt=1; -md.timestepping.final_time=600; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test347.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test347.m (revision 12026) +++ (revision ) @@ -1,49 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,4,1.2); -md=setflowequation(md,'hutter','all'); -md.cluster=none; -md.timestepping.time_adapt=1; -md.timestepping.final_time=500; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; - %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... -% (md.results.TransientSolution(3).Vx),... -% (md.results.TransientSolution(3).Vy),... -% (md.results.TransientSolution(3).Vz),... -% (md.results.TransientSolution(3).Vel),... -% (md.results.TransientSolution(3).Pressure),... -% (md.results.TransientSolution(3).Bed),... -% (md.results.TransientSolution(3).Surface),... -% (md.results.TransientSolution(3).Thickness),... -% (md.results.TransientSolution(3).Temperature),... -% (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test349.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test349.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.timestepping.time_step=0; -md.cluster=none; -md=solve(md,EnthalpySolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy','Waterfraction','Temperature'}; -field_tolerances={1e-13,1e-13,1e-13}; -field_values={... - (md.results.EnthalpySolution.Enthalpy),... - (md.results.EnthalpySolution.Waterfraction),... - (md.results.EnthalpySolution.Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test351.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test351.m (revision 12026) +++ (revision ) @@ -1,30 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md.thermal.isenthalpy=1; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy1','Waterfraction1','Temperature1',... - 'Enthalpy2','Waterfraction2','Temperature2',... - 'Enthalpy3','Waterfraction3','Temperature3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Enthalpy),... - (md.results.TransientSolution(1).Waterfraction),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(2).Enthalpy),... - (md.results.TransientSolution(2).Waterfraction),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(3).Enthalpy),... - (md.results.TransientSolution(3).Waterfraction),... - (md.results.TransientSolution(3).Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test353.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test353.m (revision 12026) +++ (revision ) @@ -1,55 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.initialization.temperature(:)=272; -md.thermal.spctemperature(find(md.mesh.vertexonsurface))=272; -md.thermal.isenthalpy=1; -md.basalforcings.geothermalflux(:)=5; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; -field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).Enthalpy),... - (md.results.TransientSolution(1).Waterfraction),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).Enthalpy),... - (md.results.TransientSolution(2).Waterfraction),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).Enthalpy),... - (md.results.TransientSolution(3).Waterfraction),... - }; Index: sm/trunk-jpl/test/NightlyRun/test401.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test403.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test405.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test407.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.m (revision 12026) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test409.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test411.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test413.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.m (revision 12026) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test415.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.m (revision 12026) +++ (revision ) @@ -1,33 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test419.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.m (revision 12026) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test421.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.m (revision 12026) +++ (revision ) @@ -1,21 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',300000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; -md.qmu.isdakota=1; - -%Dakota options -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,.01); -%md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,.01*ones(md.qmu.numberofpartitions,1)); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analysese - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); - -%Fields and tolerances to track changes -md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 12026) +++ (revision ) @@ -1,45 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%Dakota options - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; - -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analyses -md.qmu.isdakota=1; - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); - -%Fields and tolerances to track changes -md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 12026) +++ (revision ) @@ -1,71 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.materials.rho_ice=10^7; %involved in the mass flux, make it easy -md.geometry.thickness(:)=1; %make it easy - -%constrain all velocities to 1 m/yr, in the y-direction -md.diagnostic.spcvx(:)=0; -md.diagnostic.spcvy(:)=1; -md.diagnostic.spcvz(:)=0; - -%Dakota options - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; - -%variables -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%mass flux profiles -md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'}; -md.qmu.mass_flux_profile_directory=pwd; - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; -md.qmu.isdakota=1; -md.diagnostic.reltol=10^-5; %tighten for qmu analyses - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%Fields and tolerances to track changes - -%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr -%we recover those mass fluxes through the mean of the response. -%also, we recover the max velo, which should be 1m/yr. -%we put all that data in the importancefactors, which we will use to test for success. -%also, check that the stddev are 0. -md.results.dakota.importancefactors=[]; -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).mean]; -end -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).stddev]; -end -field_names ={'importancefactors'}; -field_tolerances={1e-11}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test429.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.m (revision 12026) +++ (revision ) @@ -1,38 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',170000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.timestepping.time_step=0; -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.SteadystateSolution.Gradient1),... - md.results.SteadystateSolution.J,... - (md.results.SteadystateSolution.FrictionCoefficient),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate) -}; Index: sm/trunk-jpl/test/NightlyRun/test431.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.m (revision 12026) +++ (revision ) @@ -1,38 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',170000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[102*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.timestepping.time_step=0; -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; -field_values={... - (md.results.SteadystateSolution.Gradient1),... - md.results.SteadystateSolution.J,... - (md.results.SteadystateSolution.FrictionCoefficient),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate) -}; Index: sm/trunk-jpl/test/NightlyRun/test435.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.m (revision 12026) +++ (revision ) @@ -1,21 +1,0 @@ -%test partitioning, and partition averaging -md=triangle(model,'../Exp/Square.exp',30000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%partitioning -md.qmu.numberofpartitions=100; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; - -vector=(1:1:md.mesh.numberofvertices)'; -vector_on_partition=AreaAverageOntoPartition(md,vector); -vector_on_nodes=vector_on_partition(md.qmu.partition+1); - -field_names ={'vector_on_nodes'}; -field_tolerances={1e-11}; -field_values={... - vector_on_nodes,... - }; Index: sm/trunk-jpl/test/NightlyRun/test437.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test437.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','tiling'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test439.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test439.m (revision 12026) +++ (revision ) @@ -1,49 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -%partitioning -md.qmu.numberofpartitions=10; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; -md.qmu.isdakota=1; - -%Dakota options -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('scaled_Thickness',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analysese - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%test on thickness -h=zeros(md.qmu.numberofpartitions,1); -for i=1:md.qmu.numberofpartitions, - h(i)=md.qmu.results.dresp_out(i).mean; -end - -%project onto grid -thickness=h(md.qmu.partition+1); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-11}; -field_values={thickness}; Index: sm/trunk-jpl/test/NightlyRun/test441.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','tiling'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test443.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.m (revision 12026) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','tiling'); -md.cluster=none; -md.diagnostic.reltol=0.4; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test445.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test445.m (revision 12026) +++ (revision ) @@ -1,37 +1,0 @@ -radius=1e6; -shelfextent=2e5; - -md=roundmesh(model,radius,200000); -%fix center node to 0,0 -rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); -pos=find(rad==min(rad)); -md.mesh.x(pos)=0; md.mesh.y(pos)=0; %the closest node to the center is changed to be exactly at the center -xelem=md.mesh.x(md.mesh.elements)*[1;1;1]/3; -yelem=md.mesh.y(md.mesh.elements)*[1;1;1]/3; -rad=sqrt(xelem.^2+yelem.^2); -flags=zeros(md.mesh.numberofelements,1); -pos=find(rad>=(radius-shelfextent)); -flags(pos)=1; -md=setmask(md,flags,''); -md=parameterize(md,'../Par/RoundSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; - -md.transient.isthermal=0; -md.transient.isprognostic=0; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; - -%test different grounding line dynamics -md.groundingline.migration='AgressiveMigration'; -md=solve(md,TransientSolutionEnum); -element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); - -md.groundingline.migration='SoftMigration'; -md=solve(md,TransientSolutionEnum); -element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); - -%Fields and tolerances to track changes -field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft'}; -field_tolerances={1e-13,1e-13}; -field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft}; Index: sm/trunk-jpl/test/NightlyRun/test447.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test447.m (revision 12026) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test449.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test449.m (revision 12026) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1300; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=-150; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='SoftMigration'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test451.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test451.m (revision 12026) +++ (revision ) @@ -1,42 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.cluster=none; -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test453.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test453.m (revision 12026) +++ (revision ) @@ -1,41 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1300; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -md.surfaceforcings.mass_balance(:)=-150; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='SoftMigration'; -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test455.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test455.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test457.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test457.m (revision 12026) +++ (revision ) @@ -1,20 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'pattyn','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test459.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test459.m (revision 12026) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test461.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test461.m (revision 12026) +++ (revision ) @@ -1,24 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.timestepping.time_step=0; -md.thermal.isenthalpy=1; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; -field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-10,1e-10}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.Waterfraction),... - (md.results.SteadystateSolution.Enthalpy),... - }; Index: sm/trunk-jpl/test/NightlyRun/test463.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test463.m (revision 12026) +++ (revision ) @@ -1,24 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.timestepping.time_step=0; -md.thermal.isenthalpy=1; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; -field_tolerances={1e-09,1e-10,1e-09,1e-10,1e-13,1e-10,1e-10,1e-10}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.Waterfraction),... - (md.results.SteadystateSolution.Enthalpy),... - }; Index: sm/trunk-jpl/test/NightlyRun/test501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.m (revision 12026) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test503.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.m (revision 12026) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,0.9); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test505.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.m (revision 12026) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,0.9); -md=setflowequation(md,'stokes','all'); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test507.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.m (revision 12026) +++ (revision ) @@ -1,26 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test509.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test511.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.m (revision 12026) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test513.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.m (revision 12026) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','all'); -md.cluster=none; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -%The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test515.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.m (revision 12026) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,4,1.1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test517.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test517.m (revision 12026) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test519.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test519.m (revision 12026) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','all'); -md.cluster=none; -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test521.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test521.m (revision 12026) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',10000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); - -%impose hydrostatic equilibrium (required by Stokes) -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md=modelextract(md,md.mask.elementonfloatingice); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^8*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test523.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test523.m (revision 12026) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=none; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test525.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test525.m (revision 12026) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; -md.timestepping.time_step=0; - -md.thermal.penalty_lock=5; -md.cluster=none; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.SteadystateSolution.Gradient1),... - md.results.SteadystateSolution.J,... - (md.results.SteadystateSolution.FrictionCoefficient),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate) -}; Index: sm/trunk-jpl/test/NightlyRun/test527.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test527.m (revision 12026) +++ (revision ) @@ -1,56 +1,0 @@ -%Simple mesh 1 -hVertices=10000*ones(27,1); -hVertices(1:5)=1000; -md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000,'hVertices',hVertices,'gradation',3,'geometricalmetric',1); -x1=md.mesh.x; -y1=md.mesh.y; - -%Simple mesh 2 -md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -x2=md.mesh.x; -y2=md.mesh.y; - -%refine existing mesh 1 -hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,md.inversion.vy_obs,'node'); -metric=ComputeMetric(hessian,2/9,1,1000,25*10^3,[]); -md.miscellaneous.dummy=metric; -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1); -x3=md2.mesh.x; -y3=md2.mesh.y; - -%refine existing mesh 2 -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1); -x4=md2.mesh.x; -y4=md2.mesh.y; - -%refine existing mesh 3 -hVertices=NaN*ones(md.mesh.numberofvertices,1); -hVertices(find(md.mesh.vertexonboundary))=500; -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices); -x5=md2.mesh.x; -y5=md2.mesh.y; - -%refine existing mesh 4 -md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',0,'err',1); -x6=md2.mesh.x; -y6=md2.mesh.y; - -%refine existing mesh 5 -md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',1,'err',[10 100]); -x7=md2.mesh.x; -y7=md2.mesh.y; - -%Fields and tolerances to track changes -field_names ={'x1' 'y1' 'x2' 'y2' 'x3' 'y3' 'x4' 'y4' 'x5' 'y5' 'x6' 'y6' 'x7' 'y7' }; -field_tolerances={1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13}; -field_values={... - x1, y1,... - y2, y2,... - y3, y3,... - y4, y4,... - y5, y5,... - y6, y6,... - y7, y7,... - }; Index: sm/trunk-jpl/test/NightlyRun/test529.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test529.m (revision 12026) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.thermal.stabilization=2; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature1','BasalforcingsMeltingRate1', ... - 'Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-13,1e-9,1e-13,1e-9}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test531.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test531.m (revision 12026) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.thermal.stabilization=2; -md.timestepping.time_step=0; -md.thermal.penalty_threshold=40; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-12}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.m (revision 12026) +++ (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=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test603.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.m (revision 12026) +++ (revision ) @@ -1,16 +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.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test605.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.m (revision 12026) +++ (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,6,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=none; -md=solve(md,PrognosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.PrognosticSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test607.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.m (revision 12026) +++ (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=setflowequation(md,'macayeal','all'); -md.cluster=none; -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: sm/trunk-jpl/test/NightlyRun/test609.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test609.m (revision 12026) +++ (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,5,1.5); -md=setflowequation(md,'pattyn','all'); -md.cluster=none; -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: sm/trunk-jpl/test/NightlyRun/test611.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.m (revision 12026) +++ (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=setflowequation(md,'macayeal','all'); -md.cluster=none; -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/test613.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.m (revision 12026) +++ (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=none; -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/test615.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test615.m (revision 12026) +++ (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=none; -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/test617.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test617.m (revision 12026) +++ (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=none; -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/test619.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test619.m (revision 12026) +++ (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=none; -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/test621.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test621.m (revision 12026) +++ (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=none; -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/test623.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test623.m (revision 12026) +++ (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=none; -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/test625.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test625.m (revision 12026) +++ (revision ) @@ -1,40 +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.cluster=none; -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) -};