Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m (revision 12807) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m (revision 12808) @@ -3,14 +3,15 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); +md.transient.requested_outputs=IceVolumeEnum(); 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_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'}; +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),... @@ -19,6 +20,7 @@ (md.results.TransientSolution(1).Bed),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... (md.results.TransientSolution(2).Vel),... @@ -26,6 +28,7 @@ (md.results.TransientSolution(2).Bed),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... (md.results.TransientSolution(3).Vel),... @@ -33,4 +36,5 @@ (md.results.TransientSolution(3).Bed),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).IceVolume),... }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m (revision 12807) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m (revision 12808) @@ -4,17 +4,18 @@ md=extrude(md,3,1); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); +md.transient.requested_outputs=IceVolumeEnum(); 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'}; + 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsMeltingRate1','Volume1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2','Volume2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3','Volume3'}; field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13}; field_values={... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -26,6 +27,7 @@ (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).Temperature),... (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... (md.results.TransientSolution(2).Vz),... @@ -36,6 +38,7 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).Temperature),... (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... (md.results.TransientSolution(3).Vz),... @@ -46,4 +49,5 @@ (md.results.TransientSolution(3).Thickness),... (md.results.TransientSolution(3).Temperature),... (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).IceVolume),... }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive110.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/Archive111.mat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream