Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17942) @@ -132,7 +132,7 @@ case 422, name='SquareSheetShelfStressSSAFS3dTiling'; case 423, name='RoundSheetShelfGLMigrationSSA2d'; - case 424, name='SquareSheetShelfGroundingLine2dAgressive'; + case 424, name='SquareSheetShelfGroundingLine2dAggressive'; case 425, name='SquareSheetShelfGroundingLine2dSoft'; - case 426, name='SquareSheetShelfGroundingLine3dAgressive'; + case 426, name='SquareSheetShelfGroundingLine3dAggressive'; case 427, name='SquareSheetShelfGroundingLine3dSoft'; case 428, name='SquareSheetShelfStressSSA2dNewton'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17942) @@ -131,7 +131,7 @@ 422 : 'SquareSheetShelfStressSSAFS3dTiling', 423 : 'RoundSheetShelfGLMigrationSSA2d', - 424 : 'SquareSheetShelfGroundingLine2dAgressive', + 424 : 'SquareSheetShelfGroundingLine2dAggressive', 425 : 'SquareSheetShelfGroundingLine2dSoft', - 426 : 'SquareSheetShelfGroundingLine3dAgressive', + 426 : 'SquareSheetShelfGroundingLine3dAggressive', 427 : 'SquareSheetShelfGroundingLine3dSoft', 428 : 'SquareSheetShelfStressSSA2dNewton', Index: /issm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 17942) @@ -24,5 +24,5 @@ %test different grounding line dynamics. -md.groundingline.migration='AgressiveMigration'; +md.groundingline.migration='AggressiveMigration'; md=solve(md,TransientSolutionEnum()); element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset); @@ -46,5 +46,5 @@ %Fields and tolerances to track changes -field_names ={'ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'}; +field_names ={'ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'}; field_tolerances={1e-13,2e-12,1e-13,2e-12,1e-13,3e-12,1e-13,2e-12}; field_values={element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2}; Index: /issm/trunk-jpl/test/NightlyRun/test423.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.py (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test423.py (revision 17942) @@ -35,5 +35,5 @@ #test different grounding line dynamics. -md.groundingline.migration='AgressiveMigration' +md.groundingline.migration='AggressiveMigration' md=solve(md,TransientSolutionEnum()) element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset @@ -57,5 +57,5 @@ #Fields and tolerances to track changes -field_names =['ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'] +field_names =['ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'] field_tolerances=[1e-13,2e-13,1e-13,2e-13,1e-13,2e-13,1e-13,2e-13] field_values=[element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2] Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 17942) @@ -12,5 +12,5 @@ md.transient.isstressbalance=0; md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; +md.groundingline.migration='AggressiveMigration'; md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'}; Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 17942) @@ -22,5 +22,5 @@ md.transient.isstressbalance=False md.transient.isgroundingline=True -md.groundingline.migration='AgressiveMigration' +md.groundingline.migration='AggressiveMigration' md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation'] Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 17942) @@ -13,5 +13,5 @@ md.transient.isstressbalance=0; md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; +md.groundingline.migration='AggressiveMigration'; md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'}; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 17942) @@ -23,5 +23,5 @@ md.transient.isstressbalance=False md.transient.isgroundingline=True -md.groundingline.migration='AgressiveMigration' +md.groundingline.migration='AggressiveMigration' md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation'] md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test433.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.m (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test433.m (revision 17942) @@ -25,5 +25,5 @@ %test different grounding line dynamics. -md.groundingline.migration='AgressiveMigration'; +md.groundingline.migration='AggressiveMigration'; md=solve(md,TransientSolutionEnum()); element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset); @@ -42,5 +42,5 @@ %Fields and tolerances to track changes -field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement','ElementOnIceShelfSubelement'}; +field_names ={'ElementOnIceShelfAggressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement','ElementOnIceShelfSubelement'}; field_tolerances={1e-13,1e-13,1e-13,1e-13}; field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement,element_on_iceshelf_subelement2}; Index: /issm/trunk-jpl/test/NightlyRun/test433.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.py (revision 17941) +++ /issm/trunk-jpl/test/NightlyRun/test433.py (revision 17942) @@ -36,5 +36,5 @@ #test different grounding line dynamics. -md.groundingline.migration='AgressiveMigration' +md.groundingline.migration='AggressiveMigration' md=solve(md,TransientSolutionEnum()) element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset @@ -49,5 +49,5 @@ #Fields and tolerances to track changes -field_names =['ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement'] +field_names =['ElementOnIceShelfAggressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement'] field_tolerances=[1e-13,1e-13,1e-13] field_values=[element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement] Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 17941) +++ /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 17942) @@ -102,5 +102,5 @@ #bathymetry and grounding line migration: -md.groundingline.migration='AgressiveMigration' +md.groundingline.migration='AggressiveMigration' md.geometry.bed=copy.deepcopy(md.geometry.base) pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]