Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 15926) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 15927) @@ -69,7 +69,5 @@ case 274, name='SquareShelfStressSSA2dDamageRift'; case 280, name='SquareShelfStressSSA2dHigherOrder'; - case 285, name='SquareShelfStressHOP1xP2'; - case 286, name='SquareShelfStressHOP2xP1'; - case 287, name='SquareShelfStressHOP2xP2'; + case 285, name='SquareShelfStressHOHigherOrder'; case 290, name='SquareShelfStressFSP2P1'; case 301, name='SquareSheetConstrainedStressSSA2d'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 15926) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 15927) @@ -73,7 +73,5 @@ 274 : 'SquareShelfStressSSA2dDamageRift', 280 : 'SquareShelfStressSSA2dHigherOrder', - 285 : 'SquareShelfStressHOP1xP2', - 286 : 'SquareShelfStressHOP2xP1', - 287 : 'SquareShelfStressHOP2xP2', + 285 : 'SquareShelfStressHOHigherOrder', 290 : 'SquareShelfStressFSP2P1', 301 : 'SquareSheetConstrainedStressSSA2d', Index: /issm/trunk-jpl/test/NightlyRun/test285.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test285.m (revision 15926) +++ /issm/trunk-jpl/test/NightlyRun/test285.m (revision 15927) @@ -6,10 +6,14 @@ md.flowequation.fe_HO='P1xP2'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-13}; -field_values={... +field_names={}; +field_tolerances={}; +field_values={}; +for i={'P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2'} + md.flowequation.fe_HO=i{1}; + md=solve(md,StressbalanceSolutionEnum()); + field_names ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vz' i{1}],['Vel' i{1}],['Pressure' i{1}]}; + field_tolerances={field_tolerances{:},1e-08,1e-08,1e-08,1e-08,1e-13}; + field_values={field_values{:},... (md.results.StressbalanceSolution.Vx),... (md.results.StressbalanceSolution.Vy),... @@ -18,2 +22,3 @@ (md.results.StressbalanceSolution.Pressure),... }; +end Index: /issm/trunk-jpl/test/NightlyRun/test285.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test285.py (revision 15926) +++ /issm/trunk-jpl/test/NightlyRun/test285.py (revision 15927) @@ -14,16 +14,19 @@ md.extrude(3,2.) md=setflowequation(md,'HO','all'); -md.flowequation.fe_HO='P1xP2'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); -#Fields and tolerances to track changes -field_names =['Vx', 'Vy', 'Vz', 'Vel','Pressure']; -field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-13]; -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ]; +field_names=[] +field_tolerances=[] +field_values=[] +for i in ['P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2']: + md.flowequation.fe_HO=i + md=solve(md,StressbalanceSolutionEnum()) + field_names =field_names+['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i] + field_tolerances=field_tolerances+[1e-08,1e-08,1e-08,1e-08,1e-13] + field_values=field_values+[\ + md.results.StressbalanceSolution.Vx,\ + md.results.StressbalanceSolution.Vy,\ + md.results.StressbalanceSolution.Vz,\ + md.results.StressbalanceSolution.Vel,\ + md.results.StressbalanceSolution.Pressure,\ + ] Index: sm/trunk-jpl/test/NightlyRun/test286.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test286.m (revision 15926) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2.); -md=setflowequation(md,'HO','all'); -md.flowequation.fe_HO='P2xP1'; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-9,1e-9,1e-9,1e-9,1e-13}; -field_values={... - (md.results.StressbalanceSolution.Vx),... - (md.results.StressbalanceSolution.Vy),... - (md.results.StressbalanceSolution.Vz),... - (md.results.StressbalanceSolution.Vel),... - (md.results.StressbalanceSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test286.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test286.py (revision 15926) +++ (revision ) @@ -1,29 +1,0 @@ -from model import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from EnumDefinitions import * -from solve import * -from MatlabFuncs import * -from ContourToMesh import * - -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.py'); -md.extrude(3,2.) -md=setflowequation(md,'HO','all'); -md.flowequation.fe_HO='P2xP1'; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); - -#Fields and tolerances to track changes -field_names =['Vx', 'Vy', 'Vz', 'Vel','Pressure']; -field_tolerances=[1e-9,1e-9,1e-9,1e-9,1e-13]; -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ]; Index: sm/trunk-jpl/test/NightlyRun/test287.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test287.m (revision 15926) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2.); -md=setflowequation(md,'HO','all'); -md.flowequation.fe_HO='P2'; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-13}; -field_values={... - (md.results.StressbalanceSolution.Vx),... - (md.results.StressbalanceSolution.Vy),... - (md.results.StressbalanceSolution.Vz),... - (md.results.StressbalanceSolution.Vel),... - (md.results.StressbalanceSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test287.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test287.py (revision 15926) +++ (revision ) @@ -1,29 +1,0 @@ -from model import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from EnumDefinitions import * -from solve import * -from MatlabFuncs import * -from ContourToMesh import * - -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.py'); -md.extrude(3,2.) -md=setflowequation(md,'HO','all'); -md.flowequation.fe_HO='P2'; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,StressbalanceSolutionEnum()); - -#Fields and tolerances to track changes -field_names =['Vx', 'Vy', 'Vz', 'Vel','Pressure']; -field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-13]; -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ];