Index: ../trunk-jpl/test/NightlyRun/test426.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test426.py (revision 21824) +++ ../trunk-jpl/test/NightlyRun/test426.py (revision 21825) @@ -17,40 +17,43 @@ md.geometry.thickness[:]=1000. md.geometry.surface=md.geometry.base+md.geometry.thickness md.smb.mass_balance[:]=100. -md.extrude(3,1.) md=setflowequation(md,'SSA','all') md.transient.isstressbalance=False md.transient.isgroundingline=True md.groundingline.migration='AggressiveMigration' -md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation'] +md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceMass'] +md.extrude(3,1.) md.cluster=generic('name',gethostname(),'np',3) md=solve(md,'Transient') #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1', - 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2', - 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3',] +field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1', + 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2', + 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-11,1e-10,1e-11,3e-11,2e-12,5e-12, - 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, + 1e-11,1e-10,1e-11,3e-11,2e-12,5e-12,2e-12, + 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12] field_values=[md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].IceVolume, - md.results.TransientSolution[0].IceVolumeAboveFloatation, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].IceVolume, - md.results.TransientSolution[1].IceVolumeAboveFloatation, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].IceVolume, - md.results.TransientSolution[2].IceVolumeAboveFloatation] + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].IceMass, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].IceMass, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].IceVolume, + md.results.TransientSolution[2].IceVolumeAboveFloatation, + md.results.TransientSolution[2].IceMass]