Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 22331) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 22332) @@ -1,4 +1,4 @@ %Test Name: SquareSheetShelfGroundingLine2dAggressive -md=triangle(model(),'../Exp/Square.exp',150000.); +md=triangle(model(),'../Exp/Square.exp',150000.); %was 150000. md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); @@ -14,5 +14,6 @@ md.transient.isgroundingline=1; md.groundingline.migration='AggressiveMigration'; -md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'}; +md.mesh.scale_factor=ones(md.mesh.numberofvertices,1); +md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled'}; md.cluster=generic('name',oshostname(),'np',3); @@ -20,10 +21,10 @@ %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_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}; +field_names ={'Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1',... + 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceVolumeAboveFloatationScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2',... + 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... (md.results.TransientSolution(1).Base),... @@ -33,4 +34,9 @@ (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(1).IceVolumeAboveFloatation),... + (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(1).GroundedArea),... + (md.results.TransientSolution(1).GroundedAreaScaled),... + (md.results.TransientSolution(1).FloatingArea),... + (md.results.TransientSolution(1).FloatingAreaScaled),... (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... @@ -39,4 +45,9 @@ (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(2).IceVolumeAboveFloatation),... + (md.results.TransientSolution(2).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(2).GroundedArea),... + (md.results.TransientSolution(2).GroundedAreaScaled),... + (md.results.TransientSolution(2).FloatingArea),... + (md.results.TransientSolution(2).FloatingAreaScaled),... (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... @@ -45,3 +56,8 @@ (md.results.TransientSolution(3).IceVolume),... (md.results.TransientSolution(3).IceVolumeAboveFloatation),... + (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(3).GroundedArea),... + (md.results.TransientSolution(3).GroundedAreaScaled),... + (md.results.TransientSolution(3).FloatingArea),... + (md.results.TransientSolution(3).FloatingAreaScaled),... }; Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 22331) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 22332) @@ -22,5 +22,6 @@ md.transient.isgroundingline=True md.groundingline.migration='AggressiveMigration' -md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation'] +md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled'] +md.mesh.scale_factor=0.9*np.ones((md.mesh.numberofvertices)) md.cluster=generic('name',gethostname(),'np',3) @@ -28,10 +29,10 @@ #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_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] +field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1', + 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceVolumeAboveFloatationScaled2','GroundedAred2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2', + 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] field_values=[md.results.TransientSolution[0].Base, md.results.TransientSolution[0].Surface, @@ -40,4 +41,9 @@ md.results.TransientSolution[0].IceVolume, md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, md.results.TransientSolution[1].Base, md.results.TransientSolution[1].Surface, @@ -46,4 +52,9 @@ md.results.TransientSolution[1].IceVolume, md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, md.results.TransientSolution[2].Base, md.results.TransientSolution[2].Surface, @@ -51,3 +62,8 @@ md.results.TransientSolution[2].MaskGroundediceLevelset, md.results.TransientSolution[2].IceVolume, - md.results.TransientSolution[2].IceVolumeAboveFloatation] + md.results.TransientSolution[2].IceVolumeAboveFloatation, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].GroundedAreaScaled, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].FloatingAreaScaled] Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 22331) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 22332) @@ -14,5 +14,7 @@ md.transient.isgroundingline=1; md.groundingline.migration='AggressiveMigration'; -md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation','IceMass'}; +md.mesh.scale_factor=ones(md.mesh.numberofvertices,1); +md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled','IceMass'}; +md.mesh.scale_factor=ones(md.mesh.numberofvertices,1); md=extrude(md,3,1.); md.cluster=generic('name',oshostname(),'np',3); @@ -21,10 +23,10 @@ %Fields and tolerances to track changes -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-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_names ={'Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1',... + 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2','IceVolumeAboveFloatationScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2',... + 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'}; +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-11,1e-10,1e-11,3e-11,2e-12,5e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... (md.results.TransientSolution(1).Base),... @@ -35,4 +37,9 @@ (md.results.TransientSolution(1).IceVolumeAboveFloatation),... (md.results.TransientSolution(1).IceMass),... + (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(1).GroundedArea),... + (md.results.TransientSolution(1).GroundedAreaScaled),... + (md.results.TransientSolution(1).FloatingArea),... + (md.results.TransientSolution(1).FloatingAreaScaled),... (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... @@ -42,4 +49,9 @@ (md.results.TransientSolution(2).IceVolumeAboveFloatation),... (md.results.TransientSolution(2).IceMass),... + (md.results.TransientSolution(2).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(2).GroundedArea),... + (md.results.TransientSolution(2).GroundedAreaScaled),... + (md.results.TransientSolution(2).FloatingArea),... + (md.results.TransientSolution(2).FloatingAreaScaled),... (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... @@ -49,3 +61,8 @@ (md.results.TransientSolution(3).IceVolumeAboveFloatation),... (md.results.TransientSolution(3).IceMass),... + (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled),... + (md.results.TransientSolution(3).GroundedArea),... + (md.results.TransientSolution(3).GroundedAreaScaled),... + (md.results.TransientSolution(3).FloatingArea),... + (md.results.TransientSolution(3).FloatingAreaScaled),... }; Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 22331) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 22332) @@ -22,5 +22,6 @@ md.transient.isgroundingline=True md.groundingline.migration='AggressiveMigration' -md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceMass'] +md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceMass','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled'] +md.mesh.scale_factor=0.9*np.ones((md.mesh.numberofvertices)) md.extrude(3,1.) md.cluster=generic('name',gethostname(),'np',3) @@ -29,11 +30,11 @@ #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1', - 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2', - 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3'] +field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1', + 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2','IceVolumeAboveFloatationScaled2','GroundedAred2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2', + 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'] -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_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-11,1e-10,1e-11,3e-11,2e-12,5e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13, + 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13] field_values=[md.results.TransientSolution[0].Base, @@ -43,5 +44,10 @@ md.results.TransientSolution[0].IceVolume, md.results.TransientSolution[0].IceVolumeAboveFloatation, - md.results.TransientSolution[0].IceMass, + md.results.TransientSolution[0].IceMass, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, md.results.TransientSolution[1].Base, md.results.TransientSolution[1].Surface, @@ -50,5 +56,10 @@ md.results.TransientSolution[1].IceVolume, md.results.TransientSolution[1].IceVolumeAboveFloatation, - md.results.TransientSolution[1].IceMass, + md.results.TransientSolution[1].IceMass, + md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, md.results.TransientSolution[2].Base, md.results.TransientSolution[2].Surface, @@ -57,3 +68,8 @@ md.results.TransientSolution[2].IceVolume, md.results.TransientSolution[2].IceVolumeAboveFloatation, - md.results.TransientSolution[2].IceMass] + md.results.TransientSolution[2].IceMass, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].GroundedAreaScaled, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].FloatingAreaScaled]