Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test350.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test350.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test350.m (revision 12803) @@ -1,18 +0,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=generic('name',oshostname(),'np',3); -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-13,1e-13}; -field_values={... - (md.results.EnthalpySolution.Enthalpy),... - (md.results.EnthalpySolution.Waterfraction),... - (md.results.EnthalpySolution.Temperature),... - }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test354.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test354.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test354.m (revision 12803) @@ -1,55 +0,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=generic('name',oshostname(),'np',3); -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 12803) @@ -1,55 +0,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.surfaceforcings.issmbgradients=1; -md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; -md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; -md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; -md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; -md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; -md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; -md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); -md.transient.requested_outputs=TotalSmbEnum(); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,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-09,5e-09,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).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(1).TotalSmb),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(2).TotalSmb),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).TotalSmb),... - }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test342.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test342.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test342.m (revision 12803) @@ -1,34 +0,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=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-08,1e-07,1e-10,1e-10,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test346.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test346.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test346.m (revision 12803) @@ -1,35 +0,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test330.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test330.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test330.m (revision 12803) @@ -1,47 +0,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=generic('name',oshostname(),'np',3); -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-10,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test334.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test334.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test334.m (revision 12803) @@ -1,47 +0,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=generic('name',oshostname(),'np',3); -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-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-09,5e-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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test338.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test338.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test338.m (revision 12803) @@ -1,33 +0,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)=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=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' '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.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test352.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test352.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test352.m (revision 12803) @@ -1,30 +0,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=generic('name',oshostname(),'np',3); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12803) @@ -1,45 +0,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.surfaceforcings.issmbgradients=1; -md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; -md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; -md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; -md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; -md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; -md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; -md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); -md.transient.requested_outputs=TotalSmbEnum(); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','TotalSmb1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'}; -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}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(1).TotalSmb),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).TotalSmb),... - (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(3).TotalSmb),... - }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test340.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test340.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test340.m (revision 12803) @@ -1,34 +0,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=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test344.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test344.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test344.m (revision 12803) @@ -1,34 +0,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=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-06,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test348.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test348.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test348.m (revision 12803) @@ -1,49 +0,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=generic('name',oshostname(),'np',3); -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,..., - 5*1e-11,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test332.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test332.m (revision 12803) @@ -1,33 +0,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test336.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test336.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test336.m (revision 12803) @@ -1,22 +0,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=generic('name',oshostname(),'np',3); -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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test320.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test320.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test320.m (revision 12803) @@ -1,16 +1,34 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); +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'); -md.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; + +%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=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; field_values={... - (md.results.PrognosticSolution.Thickness),... - }; + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test303.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test303.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test303.m (revision 12803) @@ -0,0 +1,16 @@ +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=generic('name',oshostname(),'np',3); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test324.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test324.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test324.m (revision 12803) @@ -1,16 +1,49 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); 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=extrude(md,5,1.2); +md=setflowequation(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,ThermalSolutionEnum); +md.timestepping.time_adapt=1; +md.timestepping.final_time=500; +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +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,..., + 5*1e-11,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.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test307.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test307.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test307.m (revision 12803) @@ -0,0 +1,18 @@ +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=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={1e-09,1e-09,1e-10,2e-10,1e-10}; +field_values={... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vz),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... + }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test328.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test328.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test328.m (revision 12803) @@ -1,33 +1,45 @@ md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'macayeal','all'); +md.surfaceforcings.issmbgradients=1; +md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; +md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; +md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; +md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; +md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; +md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; +md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); +md.transient.requested_outputs=TotalSmbEnum(); md.cluster=generic('name',oshostname(),'np',3); 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-10,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_names ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','TotalSmb1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'}; +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}; 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(1).TotalSmb),... (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).TotalSmb),... + (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(3).TotalSmb),... }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test312.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test312.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test312.m (revision 12803) @@ -1,18 +1,16 @@ 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=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,ThermalSolutionEnum); %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_names ={'Temperature','BasalforcingsMeltingRate'}; +field_tolerances={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),... + (md.results.ThermalSolution.Temperature),... + (md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test316.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test316.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test316.m (revision 12803) @@ -1,18 +1,33 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,TransientSolutionEnum); %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_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.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test321.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test321.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test321.m (revision 12803) @@ -0,0 +1,34 @@ +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=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-08,1e-07,1e-10,1e-10,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test304.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test304.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test304.m (revision 12803) @@ -1,16 +1,18 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); +md=extrude(md,3,2); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); 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_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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test325.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test325.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test325.m (revision 12803) @@ -0,0 +1,18 @@ +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=generic('name',oshostname(),'np',3); +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-13,1e-13}; +field_values={... + (md.results.EnthalpySolution.Enthalpy),... + (md.results.EnthalpySolution.Waterfraction),... + (md.results.EnthalpySolution.Temperature),... + }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test308.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test308.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test308.m (revision 12803) @@ -1,14 +1,14 @@ 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=extrude(md,3,1); +md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); 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_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... (md.results.DiagnosticSolution.Vx),... (md.results.DiagnosticSolution.Vy),... Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test329.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test329.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test329.m (revision 12803) @@ -0,0 +1,55 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.surfaceforcings.issmbgradients=1; +md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; +md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; +md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; +md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; +md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; +md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; +md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); +md.transient.requested_outputs=TotalSmbEnum(); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,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-09,5e-09,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).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(3).TotalSmb),... + }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test313.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test313.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test313.m (revision 12803) @@ -0,0 +1,20 @@ +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=generic('name',oshostname(),'np',3); +md.verbose=verbose('convergence',true,'solution',true); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test317.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test317.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test317.m (revision 12803) @@ -0,0 +1,47 @@ +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=generic('name',oshostname(),'np',3); +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-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-09,5e-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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12803) @@ -63,35 +63,35 @@ case 233, name='SquareShelfTranP3dForcTemp'; case 234, name='SquareShelfTranForceNeg2dDakotaSamp'; case 235, name='SquareShelfTranForceNeg2dDakotaLocal'; - case 302, name='SquareSheetConstrainedDiagM2d'; - case 304, name='SquareSheetConstrainedDiagH2d'; - case 306, name='SquareSheetConstrainedDiagHM2d'; - case 308, name='SquareSheetConstrainedDiagM3d'; - case 310, name='SquareSheetConstrainedDiagH3d'; - case 312, name='SquareSheetConstrainedDiagHM3d'; - case 314, name='SquareSheetConstrainedDiagP3d'; - case 316, name='SquareSheetConstrainedDiagS3d'; - case 318, name='SquareSheetConstrainedProg2d'; + case 301, name='SquareSheetConstrainedDiagM2d'; + case 302, name='SquareSheetConstrainedDiagH2d'; + case 303, name='SquareSheetConstrainedDiagHM2d'; + case 304, name='SquareSheetConstrainedDiagM3d'; + case 305, name='SquareSheetConstrainedDiagH3d'; + case 306, name='SquareSheetConstrainedDiagHM3d'; + case 307, name='SquareSheetConstrainedDiagP3d'; + case 308, name='SquareSheetConstrainedDiagS3d'; + case 309, name='SquareSheetConstrainedProg2d'; case 320, name='SquareSheetConstrainedProg2dDG'; - case 322, name='SquareSheetConstrainedProg3d'; - case 324, name='SquareSheetConstrainedTherStea'; - case 326, name='SquareSheetConstrainedTherTran'; - case 328, name='SquareSheetConstrainedTranH2d'; - case 330, name='SquareSheetConstrainedTranH3d'; - case 332, name='SquareSheetConstrainedTranM2d'; - case 334, name='SquareSheetConstrainedTranP3d'; - case 336, name='SquareSheetConstrainedSteaH3d'; - case 338, name='SquareSheetConstrainedCMDragM2d'; - case 340, name='SquareSheetConstrainedCMDragM3d'; - case 342, name='SquareSheetConstrainedCMDragP3d'; - case 344, name='SquareSheetConstrainedCMDragS3d'; - case 346, name='SquareSheetConstrainedTranCflM2d'; - case 348, name='SquareSheetConstrainedTranCflH3d'; - case 350, name='SquareSheetConstrainedEnthalpyStea'; - case 352, name='SquareSheetConstrainedEnthalpyTran'; - case 354, name='SquareSheetConstrainedTransP3dEnth'; - case 356, name='SquareSheetConstrainedSmbGradients2d'; - case 358, name='SquareSheetConstrainedSmbGradients3d'; + case 311, name='SquareSheetConstrainedProg3d'; + case 312, name='SquareSheetConstrainedTherStea'; + case 313, name='SquareSheetConstrainedTherTran'; + case 314, name='SquareSheetConstrainedTranH2d'; + case 315, name='SquareSheetConstrainedTranH3d'; + case 316, name='SquareSheetConstrainedTranM2d'; + case 317, name='SquareSheetConstrainedTranP3d'; + case 318, name='SquareSheetConstrainedSteaH3d'; + case 319, name='SquareSheetConstrainedCMDragM2d'; + case 320, name='SquareSheetConstrainedCMDragM3d'; + case 321, name='SquareSheetConstrainedCMDragP3d'; + case 322, name='SquareSheetConstrainedCMDragS3d'; + case 323, name='SquareSheetConstrainedTranCflM2d'; + case 324, name='SquareSheetConstrainedTranCflH3d'; + case 325, name='SquareSheetConstrainedEnthalpyStea'; + case 326, name='SquareSheetConstrainedEnthalpyTran'; + case 327, name='SquareSheetConstrainedTransP3dEnth'; + case 328, name='SquareSheetConstrainedSmbGradients2d'; + case 329, name='SquareSheetConstrainedSmbGradients3d'; case 402, name='SquareSheetShelfDiagM2d'; case 404, name='SquareSheetShelfDiagM3d'; case 406, name='SquareSheetShelfDiagP3d'; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test301.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test301.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test301.m (revision 12803) @@ -0,0 +1,16 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test322.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test322.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test322.m (revision 12803) @@ -1,14 +1,34 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',200000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md=extrude(md,5,0.5); +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=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-06,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... - (md.results.PrognosticSolution.Thickness),... - }; + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test305.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test305.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test305.m (revision 12803) @@ -0,0 +1,18 @@ +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=generic('name',oshostname(),'np',3); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test326.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test326.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test326.m (revision 12803) @@ -4,17 +4,27 @@ md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.verbose=verbose('convergence',true,'solution',true); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); 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 ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +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(1).BasalforcingsMeltingRate),... + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test309.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test309.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test309.m (revision 12803) @@ -0,0 +1,13 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test310.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test310.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test310.m (revision 12803) @@ -1,18 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); +md=meshconvert(md); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,5,2); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'macayeal','all'); +md.prognostic.stabilization=3; +md.prognostic.spcthickness=md.geometry.thickness; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum); %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_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (md.results.PrognosticSolution.Thickness),... }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test314.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test314.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test314.m (revision 12803) @@ -1,18 +1,33 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-10,2e-10,1e-10}; +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-10,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.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test318.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test318.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test318.m (revision 12803) @@ -1,13 +1,22 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=extrude(md,4,1); +md=setflowequation(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md.timestepping.time_step=0; +md=solve(md,SteadystateSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +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.PrognosticSolution.Thickness),... + (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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test302.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test302.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test302.m (revision 12803) @@ -1,7 +1,7 @@ md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test323.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test323.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test323.m (revision 12803) @@ -0,0 +1,35 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test306.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test306.m (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test306.m (revision 12803) @@ -1,16 +1,18 @@ -md=triangle(model,'../Exp/Square.exp',150000); +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=generic('name',oshostname(),'np',3); 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_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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test327.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test327.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test327.m (revision 12803) @@ -0,0 +1,55 @@ +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=generic('name',oshostname(),'np',3); +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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.py (revision 12802) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.py (revision 12803) @@ -65,33 +65,35 @@ 233 : 'SquareShelfTranP3dForcTemp', 234 : 'SquareShelfTranForceNeg2dDakotaSamp', 235 : 'SquareShelfTranForceNeg2dDakotaLocal', - 302 : 'SquareSheetConstrainedDiagM2d', - 304 : 'SquareSheetConstrainedDiagH2d', - 306 : 'SquareSheetConstrainedDiagHM2d', - 308 : 'SquareSheetConstrainedDiagM3d', - 310 : 'SquareSheetConstrainedDiagH3d', - 312 : 'SquareSheetConstrainedDiagHM3d', - 314 : 'SquareSheetConstrainedDiagP3d', - 316 : 'SquareSheetConstrainedDiagS3d', - 318 : 'SquareSheetConstrainedProg2d', - 320 : 'SquareSheetConstrainedProg2dDG', - 322 : 'SquareSheetConstrainedProg3d', - 324 : 'SquareSheetConstrainedTherStea', - 326 : 'SquareSheetConstrainedTherTran', - 328 : 'SquareSheetConstrainedTranH2d', - 330 : 'SquareSheetConstrainedTranH3d', - 332 : 'SquareSheetConstrainedTranM2d', - 334 : 'SquareSheetConstrainedTranP3d', - 336 : 'SquareSheetConstrainedSteaH3d', - 338 : 'SquareSheetConstrainedCMDragM2d', - 340 : 'SquareSheetConstrainedCMDragM3d', - 342 : 'SquareSheetConstrainedCMDragP3d', - 344 : 'SquareSheetConstrainedCMDragS3d', - 346 : 'SquareSheetConstrainedTranCflM2d', - 348 : 'SquareSheetConstrainedTranCflH3d', - 350 : 'SquareSheetConstrainedEnthalpyStea', - 352 : 'SquareSheetConstrainedEnthalpyTran', - 354 : 'SquareSheetConstrainedTransP3dEnth', + 301 : 'SquareSheetConstrainedDiagM2d', + 302 : 'SquareSheetConstrainedDiagH2d', + 303 : 'SquareSheetConstrainedDiagHM2d', + 304 : 'SquareSheetConstrainedDiagM3d', + 305 : 'SquareSheetConstrainedDiagH3d', + 306 : 'SquareSheetConstrainedDiagHM3d', + 307 : 'SquareSheetConstrainedDiagP3d', + 308 : 'SquareSheetConstrainedDiagS3d', + 309 : 'SquareSheetConstrainedProg2d', + 310 : 'SquareSheetConstrainedProg2dDG', + 311 : 'SquareSheetConstrainedProg3d', + 312 : 'SquareSheetConstrainedTherStea', + 313 : 'SquareSheetConstrainedTherTran', + 314 : 'SquareSheetConstrainedTranH2d', + 315 : 'SquareSheetConstrainedTranH3d', + 316 : 'SquareSheetConstrainedTranM2d', + 317 : 'SquareSheetConstrainedTranP3d', + 318 : 'SquareSheetConstrainedSteaH3d', + 319 : 'SquareSheetConstrainedCMDragM2d', + 320 : 'SquareSheetConstrainedCMDragM3d', + 321 : 'SquareSheetConstrainedCMDragP3d', + 322 : 'SquareSheetConstrainedCMDragS3d', + 323 : 'SquareSheetConstrainedTranCflM2d', + 324 : 'SquareSheetConstrainedTranCflH3d', + 325 : 'SquareSheetConstrainedEnthalpyStea', + 326 : 'SquareSheetConstrainedEnthalpyTran', + 327 : 'SquareSheetConstrainedTransP3dEnth', + 328 : 'SquareSheetConstrainedSmbGradients2d'; + 329 : 'SquareSheetConstrainedSmbGradients3d'; 402 : 'SquareSheetShelfDiagM2d', 404 : 'SquareSheetShelfDiagM3d', 406 : 'SquareSheetShelfDiagP3d', Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test311.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test311.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test311.m (revision 12803) @@ -0,0 +1,14 @@ +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=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test315.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test315.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test315.m (revision 12803) @@ -0,0 +1,47 @@ +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=generic('name',oshostname(),'np',3); +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-10,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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test319.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test319.m (revision 0) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test319.m (revision 12803) @@ -0,0 +1,33 @@ +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)=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=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' '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.FrictionCoefficient),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive350.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive354.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive333.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive337.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive342.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive346.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive351.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive330.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive334.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive338.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive343.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive347.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive352.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive331.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive335.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive339.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive340.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive344.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive348.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive353.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive332.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive336.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive341.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive345.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive349.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive311.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive313.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive315.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive317.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive319.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive320.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive322.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive324.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive326.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive328.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive301.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive303.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive305.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive307.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive309.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive310.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive312.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive314.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive316.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive318.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive321.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive323.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive325.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive327.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive329.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive302.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive304.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive306.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive308.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream