Index: ../trunk-jpl/test/NightlyRun/test280.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test280.py (revision 15925) +++ ../trunk-jpl/test/NightlyRun/test280.py (revision 15926) @@ -12,16 +12,19 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') md=setflowequation(md,'SSA','all') -md.flowequation.fe_SSA='P2' md.cluster=generic('name',oshostname(),'np',3) -md=solve(md,StressbalanceSolutionEnum()) -#Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-12,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names=[] +field_tolerances=[] +field_values=[] +for i in ['P1bubble','P1bubblecondensed','P2']: + md.flowequation.fe_SSA=i + md=solve(md,StressbalanceSolutionEnum()) + field_names =field_names+['Vx'+i,'Vy'+i,'Vel'+i,'Pressure'+i] + field_tolerances=field_tolerances+[1e-12,1e-13,1e-13,1e-13] + field_values=field_values+[\ + md.results.StressbalanceSolution.Vx,\ + md.results.StressbalanceSolution.Vy,\ + md.results.StressbalanceSolution.Vel,\ + md.results.StressbalanceSolution.Pressure,\ + ] Index: ../trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- ../trunk-jpl/test/NightlyRun/IdToName.m (revision 15925) +++ ../trunk-jpl/test/NightlyRun/IdToName.m (revision 15926) @@ -67,7 +67,7 @@ case 270, name='SquareShelfStressSSA2dDamage'; case 272, name='SquareShelfCMZSSA2dDamage'; case 274, name='SquareShelfStressSSA2dDamageRift'; - case 280, name='SquareShelfStressSSA2dP2'; + case 280, name='SquareShelfStressSSA2dHigherOrder'; case 285, name='SquareShelfStressHOP1xP2'; case 286, name='SquareShelfStressHOP2xP1'; case 287, name='SquareShelfStressHOP2xP2'; Index: ../trunk-jpl/test/NightlyRun/test280.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test280.m (revision 15925) +++ ../trunk-jpl/test/NightlyRun/test280.m (revision 15926) @@ -2,16 +2,21 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setflowequation(md,'SSA','all'); -md.flowequation.fe_SSA='P2'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-12,1e-13,1e-13,1e-13}; -field_values={... - (md.results.StressbalanceSolution.Vx),... - (md.results.StressbalanceSolution.Vy),... - (md.results.StressbalanceSolution.Vel),... - (md.results.StressbalanceSolution.Pressure),... - }; +field_names={}; +field_tolerances={}; +field_values={}; +for i={'P1bubble','P1bubblecondensed','P2'} + md.flowequation.fe_SSA=i{1}; + md=solve(md,StressbalanceSolutionEnum()); + field_names ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vel' i{1}],['Pressure' i{1}]}; + field_tolerances={field_tolerances{:},1e-12,1e-13,1e-13,1e-13}; + field_values={field_values{:},... + (md.results.StressbalanceSolution.Vx),... + (md.results.StressbalanceSolution.Vy),... + (md.results.StressbalanceSolution.Vel),... + (md.results.StressbalanceSolution.Pressure),... + }; +end + Index: ../trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 15925) +++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 15926) @@ -71,7 +71,7 @@ 270 : 'SquareShelfStressSSA2dDamage', 272 : 'SquareShelfCMZSSA2dDamage', 274 : 'SquareShelfStressSSA2dDamageRift', - 280 : 'SquareShelfStressSSA2dP2', + 280 : 'SquareShelfStressSSA2dHigherOrder', 285 : 'SquareShelfStressHOP1xP2', 286 : 'SquareShelfStressHOP2xP1', 287 : 'SquareShelfStressHOP2xP2',