Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 11347) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 11348) @@ -48,4 +48,6 @@ case 141, name='SquareShelfConstrainedEnthalpyTranSerial'; case 142, name='SquareShelfConstrainedEnthalpyTranParallel'; + case 143, name='SquareShelfConstrainedTransP3dEnthSerial'; + case 144, name='SquareShelfConstrainedTransP3dEnthParallel'; case 201, name='SquareShelfDiagM2dSerial'; case 202, name='SquareShelfDiagM2dParallel'; @@ -168,4 +170,6 @@ case 351, name='SquareSheetConstrainedEnthalpyTranSerial'; case 352, name='SquareSheetConstrainedEnthalpyTranParallel'; + case 353, name='SquareSheetConstrainedTransP3dEnthSerial'; + case 354, name='SquareSheetConstrainedTransP3dEnthParallel'; case 401, name='SquareSheetShelfDiagM2dSerial'; case 402, name='SquareSheetShelfDiagM2dParallel'; Index: /issm/trunk-jpl/test/NightlyRun/test143.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test143.m (revision 11348) +++ /issm/trunk-jpl/test/NightlyRun/test143.m (revision 11348) @@ -0,0 +1,51 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md.thermal.isenthalpy=1; +md.thermal.stabilization=2; +md.cluster=none; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).Enthalpy),... + (md.results.TransientSolution(1).Waterfraction),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).Enthalpy),... + (md.results.TransientSolution(2).Waterfraction),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).Enthalpy),... + (md.results.TransientSolution(3).Waterfraction),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test144.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test144.m (revision 11348) +++ /issm/trunk-jpl/test/NightlyRun/test144.m (revision 11348) @@ -0,0 +1,55 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md.thermal.isenthalpy=1; +md.thermal.stabilization=2; +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names={... + 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).Enthalpy),... + (md.results.TransientSolution(1).Waterfraction),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).Enthalpy),... + (md.results.TransientSolution(2).Waterfraction),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).Enthalpy),... + (md.results.TransientSolution(3).Waterfraction),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test354.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test354.m (revision 11348) +++ /issm/trunk-jpl/test/NightlyRun/test354.m (revision 11348) @@ -0,0 +1,55 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md.initialization.temperature(:)=272; +md.thermal.spctemperature(find(md.mesh.vertexonsurface))=272; +md.thermal.isenthalpy=1; +md.basalforcings.geothermalflux(:)=5; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).Enthalpy),... + (md.results.TransientSolution(1).Waterfraction),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).Enthalpy),... + (md.results.TransientSolution(2).Waterfraction),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).Enthalpy),... + (md.results.TransientSolution(3).Waterfraction),... + };