Index: /issm/trunk-jpl/test/NightlyRun/test443.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.m (revision 22337) +++ /issm/trunk-jpl/test/NightlyRun/test443.m (revision 22338) @@ -14,4 +14,5 @@ md.transient.isgroundingline=1; md.groundingline.migration='AggressiveMigration'; +md.mesh.scale_factor=1.1*ones(md.mesh.numberofvertices,1); md.settings.output_frequency=2; @@ -23,5 +24,6 @@ regionalmask(find(in))=1; md.transient.requested_outputs={'default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',... - 'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation'}; + 'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation',... + 'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2'}; md.outputdefinition.definitions{1}=regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,... 'definitionstring','Outputdefinition1'); @@ -42,4 +44,12 @@ md.outputdefinition.definitions{9}=regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation',... 'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md); +md.outputdefinition.definitions{10}=regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,... + 'definitionstring','Outputdefinition10'); +md.outputdefinition.definitions{11}=regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,... + 'definitionstring','Outputdefinition11'); +md.outputdefinition.definitions{12}=regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,... + 'definitionstring','Outputdefinition12'); +md.outputdefinition.definitions{13}=regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled',... + 'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md); md=extrude(md,3,1); @@ -50,9 +60,11 @@ field_names ={'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21',... 'Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',... + 'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21',... 'IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23',... 'Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3',... + 'IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23',... 'ExtrudedMask','CollapsedMask'}; -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}; +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}; field_values={... (md.results.TransientSolution(1).IceMass1),... @@ -66,4 +78,8 @@ (md.results.TransientSolution(1).TotalGroundedBmb1),... (md.results.TransientSolution(1).TotalSmb1),... + (md.results.TransientSolution(1).IceMassScaled1),... + (md.results.TransientSolution(1).IceVolumeScaled1),... + (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled1),... + (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled2),... (md.results.TransientSolution(3).IceMass1),... (md.results.TransientSolution(3).IceVolume1),... @@ -76,4 +92,8 @@ (md.results.TransientSolution(3).TotalGroundedBmb1),... (md.results.TransientSolution(3).TotalSmb1),... + (md.results.TransientSolution(3).IceMassScaled1),... + (md.results.TransientSolution(3).IceVolumeScaled1),... + (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled1),... + (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled2),... length(md.outputdefinition.definitions{1}.mask),... length(md2.outputdefinition.definitions{1}.mask),... Index: /issm/trunk-jpl/test/NightlyRun/test443.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.py (revision 22337) +++ /issm/trunk-jpl/test/NightlyRun/test443.py (revision 22338) @@ -27,4 +27,5 @@ md.transient.isgroundingline=True md.groundingline.migration='AggressiveMigration'; +md.mesh.scale_factor=1.1*np.ones((md.mesh.numberofvertices)) md.settings.output_frequency=2 @@ -35,5 +36,5 @@ inflag=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'../Exp/SquareHalfRight.exp','node',1) regionalmask[np.nonzero(inflag)[0]] = 1. -md.transient.requested_outputs=['default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation'] +md.transient.requested_outputs=['default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2'] md.outputdefinition.definitions=[regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,'definitionstring','Outputdefinition1'), @@ -45,5 +46,9 @@ regionaloutput('name','IceVolumeAboveFloatation1','outputnamestring','IceVolumeAboveFloatation','mask',regionalmask,'definitionstring','Outputdefinition7'), regionaloutput('name','TotalSmb1','outputnamestring','TotalSmb','mask',regionalmask,'definitionstring','Outputdefinition8'), - regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md)] + regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md), + regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,'definitionstring','Outputdefinition10'), + regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,'definitionstring','Outputdefinition11'), + regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,'definitionstring','Outputdefinition12'), + regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md)] md.extrude(3,1.) @@ -53,6 +58,6 @@ #Fields and tolerances to track changes -field_names =['IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3','ExtrudedMask','CollapsedMask'] -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] +field_names =['IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21','IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3','IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23','ExtrudedMask','CollapsedMask'] +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] field_values=[\ md.results.TransientSolution[0].IceMass1,\ @@ -66,4 +71,8 @@ md.results.TransientSolution[0].TotalGroundedBmb1,\ md.results.TransientSolution[0].TotalSmb1,\ + md.results.TransientSolution[0].IceMassScaled1,\ + md.results.TransientSolution[0].IceVolumeScaled1,\ + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled1,\ + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled2,\ md.results.TransientSolution[2].IceMass1,\ md.results.TransientSolution[2].IceVolume1,\ @@ -76,4 +85,8 @@ md.results.TransientSolution[2].TotalGroundedBmb1,\ md.results.TransientSolution[2].TotalSmb1,\ + md.results.TransientSolution[2].IceMassScaled1,\ + md.results.TransientSolution[2].IceVolumeScaled1,\ + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled1,\ + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled2,\ len(md.outputdefinition.definitions[0].mask),\ len(md2.outputdefinition.definitions[0].mask),\