Index: /issm/trunk-jpl/test/NightlyRun/test540.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test540.m (revision 26684) +++ /issm/trunk-jpl/test/NightlyRun/test540.m (revision 26685) @@ -17,4 +17,5 @@ md.levelset.spclevelset(pos) = md.mask.ice_levelset(pos); md.levelset.migration_max = 1e10; +md.transient.requested_outputs={'default','IceVolume','IceVolumeAboveFloatation','TotalSmb','TotalGroundedBmb','TotalFloatingBmb'}; %Force MUMPS sequential analysis @@ -26,11 +27,17 @@ field_names ={... 'Vx1' ,'Vy1' ,'Vel1' ,'Pressure1' ,'Bed1' ,'Surface1' ,'Thickness1' ,'MaskIceLevelset1' ,... + 'IceVolume1' ,'IceVolumeAboveFloatation1' ,'TotalSmb1' ,'TotalGroundedBmb1' ,'TotalFloatingBmb1' ,... 'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' ,... + 'IceVolume2' ,'IceVolumeAboveFloatation2' ,'TotalSmb2' ,'TotalGroundedBmb2' ,'TotalFloatingBmb2' ,... 'Vx10','Vy10','Vel10','Pressure10','Bed10','Surface10','Thickness10','MaskIceLevelset10',... + 'IceVolume10' ,'IceVolumeAboveFloatation10' ,'TotalSmb10' ,'TotalGroundedBmb10' ,'TotalFloatingBmb10' ,... }; field_tolerances={... 1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-12,... + 1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-9,... + 1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,... }; field_values={... @@ -43,4 +50,9 @@ (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).MaskIceLevelset),... + (md.results.TransientSolution(1).IceVolume),... + (md.results.TransientSolution(1).IceVolumeAboveFloatation),... + (md.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(1).TotalGroundedBmb),... + (md.results.TransientSolution(1).TotalFloatingBmb),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -51,4 +63,9 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).MaskIceLevelset),... + (md.results.TransientSolution(2).IceVolume),... + (md.results.TransientSolution(2).IceVolumeAboveFloatation),... + (md.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(2).TotalGroundedBmb),... + (md.results.TransientSolution(2).TotalFloatingBmb),... (md.results.TransientSolution(10).Vx),... (md.results.TransientSolution(10).Vy),... @@ -59,3 +76,8 @@ (md.results.TransientSolution(10).Thickness),... (md.results.TransientSolution(10).MaskIceLevelset),... + (md.results.TransientSolution(10).IceVolume),... + (md.results.TransientSolution(10).IceVolumeAboveFloatation),... + (md.results.TransientSolution(10).TotalSmb),... + (md.results.TransientSolution(10).TotalGroundedBmb),... + (md.results.TransientSolution(10).TotalFloatingBmb),... }; Index: /issm/trunk-jpl/test/NightlyRun/test540.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test540.py (revision 26684) +++ /issm/trunk-jpl/test/NightlyRun/test540.py (revision 26685) @@ -27,4 +27,5 @@ md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos] md.levelset.migration_max = 1e10 +md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeAboveFloatation','TotalSmb','TotalGroundedBmb','TotalFloatingBmb'] #Force MUMPS sequential analysis @@ -35,9 +36,15 @@ #Fields and tolerances to track changes field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', + 'IceVolume1', 'IceVolumeAboveFloatation1', 'TotalSmb1', 'TotalGroundedBmb1', 'TotalFloatingBmb1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', - 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10'] + 'IceVolume2', 'IceVolumeAboveFloatation2', 'TotalSmb2', 'TotalGroundedBmb2', 'TotalFloatingBmb2', + 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', + 'IceVolume10', 'IceVolumeAboveFloatation10', 'TotalSmb10', 'TotalGroundedBmb10', 'TotalFloatingBmb10'] field_tolerances = [1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-12, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-12, - 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-9] + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-9, + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] field_values = [md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -48,4 +55,9 @@ md.results.TransientSolution[0].Thickness, md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[0].TotalFloatingBmb, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -56,4 +68,9 @@ md.results.TransientSolution[1].Thickness, md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[1].TotalFloatingBmb, md.results.TransientSolution[9].Vx, md.results.TransientSolution[9].Vy, @@ -63,3 +80,8 @@ md.results.TransientSolution[9].Surface, md.results.TransientSolution[9].Thickness, - md.results.TransientSolution[9].MaskIceLevelset] + md.results.TransientSolution[9].MaskIceLevelset. + md.results.TransientSolution[9].IceVolume, + md.results.TransientSolution[9].IceVolumeAboveFloatation, + md.results.TransientSolution[9].TotalSmb, + md.results.TransientSolution[9].TotalGroundedBmb, + md.results.TransientSolution[9].TotalFloatingBmb] Index: /issm/trunk-jpl/test/NightlyRun/test541.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test541.m (revision 26684) +++ /issm/trunk-jpl/test/NightlyRun/test541.m (revision 26685) @@ -17,4 +17,5 @@ md.levelset.spclevelset(pos) = md.mask.ice_levelset(pos); md.levelset.migration_max = 1e10; +md.transient.requested_outputs={'default','IceVolume','IceVolumeAboveFloatation','TotalSmb','TotalGroundedBmb','TotalFloatingBmb'}; %Force MUMPS sequential analysis @@ -26,11 +27,17 @@ field_names ={... 'Vx1' ,'Vy1' ,'Vel1' ,'Pressure1' ,'Bed1' ,'Surface1' ,'Thickness1' ,'MaskIceLevelset1' ,... + 'IceVolume1' ,'IceVolumeAboveFloatation1' ,'TotalSmb1' ,'TotalGroundedBmb1' ,'TotalFloatingBmb1' ,... + 'IceVolume2' ,'IceVolumeAboveFloatation2' ,'TotalSmb2' ,'TotalGroundedBmb2' ,'TotalFloatingBmb2' ,... 'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' ,... 'Vx10','Vy10','Vel10','Pressure10','Bed10','Surface10','Thickness10','MaskIceLevelset10',... + 'IceVolume10' ,'IceVolumeAboveFloatation10' ,'TotalSmb10' ,'TotalGroundedBmb10' ,'TotalFloatingBmb10' ,... }; field_tolerances={... 1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,... + 1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,... 2e-11,1e-11,1e-11,9e-12,2e-1,2e-11,2e-11,1e-11,... + 1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,... 2e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9,... + 1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,... }; field_values={... @@ -43,4 +50,9 @@ (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).MaskIceLevelset),... + (md.results.TransientSolution(1).IceVolume),... + (md.results.TransientSolution(1).IceVolumeAboveFloatation),... + (md.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(1).TotalGroundedBmb),... + (md.results.TransientSolution(1).TotalFloatingBmb),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -51,4 +63,9 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).MaskIceLevelset),... + (md.results.TransientSolution(2).IceVolume),... + (md.results.TransientSolution(2).IceVolumeAboveFloatation),... + (md.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(2).TotalGroundedBmb),... + (md.results.TransientSolution(2).TotalFloatingBmb),... (md.results.TransientSolution(10).Vx),... (md.results.TransientSolution(10).Vy),... @@ -59,3 +76,8 @@ (md.results.TransientSolution(10).Thickness),... (md.results.TransientSolution(10).MaskIceLevelset),... + (md.results.TransientSolution(10).IceVolume),... + (md.results.TransientSolution(10).IceVolumeAboveFloatation),... + (md.results.TransientSolution(10).TotalSmb),... + (md.results.TransientSolution(10).TotalGroundedBmb),... + (md.results.TransientSolution(10).TotalFloatingBmb),... }; Index: /issm/trunk-jpl/test/NightlyRun/test541.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test541.py (revision 26684) +++ /issm/trunk-jpl/test/NightlyRun/test541.py (revision 26685) @@ -27,4 +27,5 @@ md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos] md.levelset.migration_max = 1e10 +md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeAboveFloatation','TotalSmb','TotalGroundedBmb','TotalFloatingBmb'] #Force MUMPS sequential analysis @@ -35,9 +36,15 @@ #Fields and tolerances to track changes field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', + 'IceVolume1', 'IceVolumeAboveFloatation1', 'TotalSmb1', 'TotalGroundedBmb1', 'TotalFloatingBmb1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', - 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10'] + 'IceVolume2', 'IceVolumeAboveFloatation2', 'TotalSmb2', 'TotalGroundedBmb2', 'TotalFloatingBmb2', + 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', + 'IceVolume10', 'IceVolumeAboveFloatation10', 'TotalSmb10', 'TotalGroundedBmb10', 'TotalFloatingBmb10'] field_tolerances = [1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12, + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 2e-11, 1e-11, 1e-11, 9e-12, 2e-1, 2e-11, 2e-11, 1e-11, - 2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9] + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, + 1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] field_values = [md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -48,4 +55,9 @@ md.results.TransientSolution[0].Thickness, md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[0].TotalFloatingBmb, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -56,4 +68,9 @@ md.results.TransientSolution[1].Thickness, md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[1].TotalFloatingBmb, md.results.TransientSolution[9].Vx, md.results.TransientSolution[9].Vy, @@ -63,3 +80,8 @@ md.results.TransientSolution[9].Surface, md.results.TransientSolution[9].Thickness, - md.results.TransientSolution[9].MaskIceLevelset] + md.results.TransientSolution[9].MaskIceLevelset, + md.results.TransientSolution[9].IceVolume, + md.results.TransientSolution[9].IceVolumeAboveFloatation, + md.results.TransientSolution[9].TotalSmb, + md.results.TransientSolution[9].TotalGroundedBmb, + md.results.TransientSolution[9].TotalFloatingBmb]