Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12788) @@ -7,26 +7,26 @@ switch id, - case 102, name='SquareShelfConstrainedDiagM2d'; - case 104, name='SquareShelfConstrainedDiagM3d'; - case 106, name='SquareShelfConstrainedDiagP3d'; - case 108, name='SquareShelfConstrainedDiagS3d'; - case 110, name='SquareShelfConstrainedProg2d'; - case 112, name='SquareShelfConstrainedProg2dDG'; - case 114, name='SquareShelfConstrainedProg3d'; - case 116, name='SquareShelfConstrainedTherStea'; - case 118, name='SquareShelfConstrainedTherTran'; - case 120, name='SquareShelfConstrainedTranM2d'; - case 122, name='SquareShelfConstrainedTranP3d'; - case 124, name='SquareShelfConstrainedSurfSlop2d'; - case 126, name='SquareShelfConstrainedSurfSlope3d'; - case 128, name='SquareShelfConstrainedBedSlop2d'; - case 130, name='SquareShelfConstrainedBedSlop3d'; - case 132, name='SquareShelfConstrainedBalThic2d'; - case 134, name='SquareShelfConstrainedBalThic3d'; - case 136, name='SquareShelfConstrainedBalThic2dDG'; - case 137, name='SquareBamgMesh'; - case 140, name='SquareShelfConstrainedEnthalpyStea'; - case 142, name='SquareShelfConstrainedEnthalpyTran'; - case 144, name='SquareShelfConstrainedTransP3dEnth'; + case 101, name='SquareShelfConstrainedDiagM2d'; + case 102, name='SquareShelfConstrainedDiagM3d'; + case 103, name='SquareShelfConstrainedDiagP3d'; + case 104, name='SquareShelfConstrainedDiagS3d'; + case 105, name='SquareShelfConstrainedProg2d'; + case 106, name='SquareShelfConstrainedProg2dDG'; + case 107, name='SquareShelfConstrainedProg3d'; + case 108, name='SquareShelfConstrainedTherStea'; + case 109, name='SquareShelfConstrainedTherTran'; + case 110, name='SquareShelfConstrainedTranM2d'; + case 111, name='SquareShelfConstrainedTranP3d'; + case 112, name='SquareShelfConstrainedSurfSlop2d'; + case 113, name='SquareShelfConstrainedSurfSlope3d'; + case 114, name='SquareShelfConstrainedBedSlop2d'; + case 115, name='SquareShelfConstrainedBedSlop3d'; + case 116, name='SquareShelfConstrainedBalThic2d'; + case 117, name='SquareShelfConstrainedBalThic3d'; + case 118, name='SquareShelfConstrainedBalThic2dDG'; + case 119, name='SquareBamgMesh'; + case 120, name='SquareShelfConstrainedEnthalpyStea'; + case 121, name='SquareShelfConstrainedEnthalpyTran'; + case 122, name='SquareShelfConstrainedTransP3dEnth'; case 202, name='SquareShelfDiagM2d'; case 204, name='SquareShelfDiagM3d'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12788) @@ -9,26 +9,26 @@ def IdToName(id): idname={ - 102 : 'SquareShelfConstrainedDiagM2d', - 104 : 'SquareShelfConstrainedDiagM3d', - 106 : 'SquareShelfConstrainedDiagP3d', - 108 : 'SquareShelfConstrainedDiagS3d', - 110 : 'SquareShelfConstrainedProg2d', - 112 : 'SquareShelfConstrainedProg2dDG', - 114 : 'SquareShelfConstrainedProg3d', - 116 : 'SquareShelfConstrainedTherStea', - 118 : 'SquareShelfConstrainedTherTran', - 120 : 'SquareShelfConstrainedTranM2d', - 122 : 'SquareShelfConstrainedTranP3d', - 124 : 'SquareShelfConstrainedSurfSlop2d', - 126 : 'SquareShelfConstrainedSurfSlope3d', - 128 : 'SquareShelfConstrainedBedSlop2d', - 130 : 'SquareShelfConstrainedBedSlop3d', - 132 : 'SquareShelfConstrainedBalThic2d', - 134 : 'SquareShelfConstrainedBalThic3d', - 136 : 'SquareShelfConstrainedBalThic2dDG', - 137 : 'SquareBamgMesh', - 140 : 'SquareShelfConstrainedEnthalpyStea', - 142 : 'SquareShelfConstrainedEnthalpyTran', - 144 : 'SquareShelfConstrainedTransP3dEnth', + 101 : 'SquareShelfConstrainedDiagM2d', + 102 : 'SquareShelfConstrainedDiagM3d', + 103 : 'SquareShelfConstrainedDiagP3d', + 104 : 'SquareShelfConstrainedDiagS3d', + 105 : 'SquareShelfConstrainedProg2d', + 106 : 'SquareShelfConstrainedProg2dDG', + 107 : 'SquareShelfConstrainedProg3d', + 108 : 'SquareShelfConstrainedTherStea', + 109 : 'SquareShelfConstrainedTherTran', + 110 : 'SquareShelfConstrainedTranM2d', + 111 : 'SquareShelfConstrainedTranP3d', + 112 : 'SquareShelfConstrainedSurfSlop2d', + 113 : 'SquareShelfConstrainedSurfSlope3d', + 114 : 'SquareShelfConstrainedBedSlop2d', + 115 : 'SquareShelfConstrainedBedSlop3d', + 116 : 'SquareShelfConstrainedBalThic2d', + 117 : 'SquareShelfConstrainedBalThic3d', + 118 : 'SquareShelfConstrainedBalThic2dDG', + 119 : 'SquareBamgMesh', + 120 : 'SquareShelfConstrainedEnthalpyStea', + 121 : 'SquareShelfConstrainedEnthalpyTran', + 122 : 'SquareShelfConstrainedTransP3dEnth', 202 : 'SquareShelfDiagM2d', 204 : 'SquareShelfDiagM3d', Index: /issm/trunk-jpl/test/NightlyRun/test101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test101.m (revision 12788) @@ -0,0 +1,22 @@ +md=triangle(model,'../Exp/Square.exp',50000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.diagnostic.requested_outputs=StressTensorEnum; +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vel','Pressure',... + 'StressTensorxx','StressTensoryy','StressTensorxy'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13}; +field_values={... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.StressTensorxx),... + (md.results.DiagnosticSolution.StressTensoryy),... + (md.results.DiagnosticSolution.StressTensorxy),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.py (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test101.py (revision 12788) @@ -0,0 +1,24 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * + +md=model() +md=triangle(md,'../Exp/Square.exp',50000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vel','Pressure',\ + 'StressTensorxx','StressTensoryy','StressTensorxy'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13] +field_values=[\ + [md.results.DiagnosticSolution.Vx],\ + [md.results.DiagnosticSolution.Vy],\ + [md.results.DiagnosticSolution.Vel],\ + [md.results.DiagnosticSolution.Pressure],\ + [md.results.DiagnosticSolution.StressTensorxx],\ + [md.results.DiagnosticSolution.StressTensoryy],\ + [md.results.DiagnosticSolution.StressTensorxy],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test102.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test102.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test102.m (revision 12788) @@ -1,22 +1,18 @@ -md=triangle(model,'../Exp/Square.exp',50000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,2); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.requested_outputs=StressTensorEnum; md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure',... - 'StressTensorxx','StressTensoryy','StressTensorxy'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13}; +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... (md.results.DiagnosticSolution.Vx),... (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vz),... (md.results.DiagnosticSolution.Vel),... (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.StressTensorxx),... - (md.results.DiagnosticSolution.StressTensoryy),... - (md.results.DiagnosticSolution.StressTensorxy),... }; Index: sm/trunk-jpl/test/NightlyRun/test102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test102.py (revision 12787) +++ (revision ) @@ -1,24 +1,0 @@ -from model import * -from triangle import * -from setmask import * -from parameterize import * - -md=model() -md=triangle(md,'../Exp/Square.exp',50000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') - -#Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure',\ - 'StressTensorxx','StressTensoryy','StressTensorxy'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13] -field_values=[\ - [md.results.DiagnosticSolution.Vx],\ - [md.results.DiagnosticSolution.Vy],\ - [md.results.DiagnosticSolution.Vel],\ - [md.results.DiagnosticSolution.Pressure],\ - [md.results.DiagnosticSolution.StressTensorxx],\ - [md.results.DiagnosticSolution.StressTensoryy],\ - [md.results.DiagnosticSolution.StressTensorxy],\ - ] Index: /issm/trunk-jpl/test/NightlyRun/test103.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test103.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test103.m (revision 12788) @@ -0,0 +1,27 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,2); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.diagnostic.requested_outputs=StressTensorEnum; +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vz','Vel','Pressure',... + 'StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; +field_values={... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vz),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.StressTensorxx),... + (md.results.DiagnosticSolution.StressTensoryy),... + (md.results.DiagnosticSolution.StressTensorzz),... + (md.results.DiagnosticSolution.StressTensorxy),... + (md.results.DiagnosticSolution.StressTensorxz),... + (md.results.DiagnosticSolution.StressTensoryz),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test104.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test104.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test104.m (revision 12788) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum); @@ -9,5 +9,5 @@ %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; +field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08}; field_values={... (md.results.DiagnosticSolution.Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test105.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test105.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test105.m (revision 12788) @@ -0,0 +1,13 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test106.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test106.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test106.m (revision 12788) @@ -1,27 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); +md=meshconvert(md); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.requested_outputs=StressTensorEnum; -md=solve(md,DiagnosticSolutionEnum); +md.prognostic.stabilization=3; +md.prognostic.spcthickness=md.geometry.thickness; +md=solve(md,PrognosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure',... - 'StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; +field_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.StressTensorxx),... - (md.results.DiagnosticSolution.StressTensoryy),... - (md.results.DiagnosticSolution.StressTensorzz),... - (md.results.DiagnosticSolution.StressTensorxy),... - (md.results.DiagnosticSolution.StressTensorxz),... - (md.results.DiagnosticSolution.StressTensoryz),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk-jpl/test/NightlyRun/test107.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test107.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test107.m (revision 12788) @@ -0,0 +1,14 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md=extrude(md,5,3); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,PrognosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.PrognosticSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test108.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test108.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test108.m (revision 12788) @@ -2,17 +2,15 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,2); -md=setflowequation(md,'stokes','all'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,ThermalSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-13,1e-13}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (md.results.ThermalSolution.Temperature),... + (md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test109.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test109.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test109.m (revision 12788) @@ -0,0 +1,19 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.transient.isdiagnostic=0; +md.transient.isprognostic=0; +md.transient.isthermal=1; +md.transient.isgroundingline=0; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-13,1e-13}; +field_values={... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test110.m (revision 12788) @@ -4,10 +4,33 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); + +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; +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}; field_values={... - (md.results.PrognosticSolution.Thickness),... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (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(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (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(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (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),... }; Index: /issm/trunk-jpl/test/NightlyRun/test111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test111.m (revision 12788) @@ -0,0 +1,49 @@ +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.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).BasalforcingsMeltingRate),... + (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).BasalforcingsMeltingRate),... + (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).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test112.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test112.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test112.m (revision 12788) @@ -1,16 +1,14 @@ md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.stabilization=3; -md.prognostic.spcthickness=md.geometry.thickness; -md=solve(md,PrognosticSolutionEnum); +md=solve(md,SurfaceSlopeSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; +field_tolerances={1e-13,1e-13}; field_values={... - (md.results.PrognosticSolution.Thickness),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... }; Index: /issm/trunk-jpl/test/NightlyRun/test113.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test113.m (revision 12788) @@ -0,0 +1,15 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,5,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,SurfaceSlopeSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; +field_tolerances={1e-13,1e-13}; +field_values={... + (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... + (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test114.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test114.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test114.m (revision 12788) @@ -3,12 +3,12 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); -md=extrude(md,5,3); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,BedSlopeSolutionEnum); %Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; +field_names ={'BedSlopeX','BedSlopeY'}; +field_tolerances={1e-13,1e-13}; field_values={... - (md.results.PrognosticSolution.Thickness),... + (md.results.BedSlopeSolution.BedSlopeX),... + (md.results.BedSlopeSolution.BedSlopeY),... }; Index: /issm/trunk-jpl/test/NightlyRun/test115.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test115.m (revision 12788) @@ -0,0 +1,15 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,5,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,BedSlopeSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'BedSlopeX','BedSlopeY'}; +field_tolerances={1e-13,1e-13}; +field_values={... + (md.results.BedSlopeSolution.BedSlopeX),... + (md.results.BedSlopeSolution.BedSlopeY),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test116.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test116.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test116.m (revision 12788) @@ -1,16 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); +%Add boundary conditions on thickness on the border +pos=find(md.mesh.vertexonboundary); +md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,ThermalSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk-jpl/test/NightlyRun/test117.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test117.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test117.m (revision 12788) @@ -0,0 +1,17 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,5,1); +%Add boundary conditions on thickness on the border +pos=find(md.mesh.vertexonboundary); +md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,BalancethicknessSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Thickness'}; +field_tolerances={1e-13}; +field_values={... + (md.results.BalancethicknessSolution.Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test118.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test118.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test118.m (revision 12788) @@ -1,19 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); +md=meshconvert(md); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); +md.balancethickness.stabilization=3; +md.initialization.vy=md.initialization.vy+400; md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Thickness'}; +field_tolerances={1e-13}; field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk-jpl/test/NightlyRun/test119.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test119.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test119.m (revision 12788) @@ -0,0 +1,25 @@ + +%Simple mesh +md=bamg(model,'domain','../Exp/Square.exp','hmax',100000); +x1=md.mesh.x; +y1=md.mesh.y; + +%hVertices +md=bamg(model,'domain','../Exp/Square.exp','hmax',300000,'hvertices',[10000 100000 400000 100000]'); +x2=md.mesh.x; +y2=md.mesh.y; + +%big mesh +t0=clock; +md=bamg(model,'domain','../Exp/Square.exp','hmax',3000); +nbelements=md.mesh.numberofelements; +elapsedtime=etime(clock,t0); + +%Fields and tolerances to track changes +field_names ={'x1' 'y1' 'x2' 'y2' 'nbelements' 'elapsed time'}; +field_tolerances={1e-13 1e-13 1e-13 1e-13 1e-13 0.5}; +field_values={... + x1, y1,... + x2, y2,... + nbelements,elapsedtime... + }; Index: /issm/trunk-jpl/test/NightlyRun/test120.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test120.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test120.m (revision 12788) @@ -1,36 +1,18 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); - -md=solve(md,TransientSolutionEnum); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md=solve(md,EnthalpySolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; -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}; +field_names ={'Enthalpy','Waterfraction','Temperature'}; +field_tolerances={1e-13,1e-10,1e-13}; field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (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(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (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(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (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.EnthalpySolution.Enthalpy),... + (md.results.EnthalpySolution.Waterfraction),... + (md.results.EnthalpySolution.Temperature),... }; Index: /issm/trunk-jpl/test/NightlyRun/test121.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test121.m (revision 12788) +++ /issm/trunk-jpl/test/NightlyRun/test121.m (revision 12788) @@ -0,0 +1,30 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md.transient.isdiagnostic=0; +md.transient.isprognostic=0; +md.transient.isthermal=1; +md.transient.isgroundingline=0; +md.thermal.isenthalpy=1; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Enthalpy1','Waterfraction1','Temperature1',... + 'Enthalpy2','Waterfraction2','Temperature2',... + 'Enthalpy3','Waterfraction3','Temperature3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13}; +field_values={... + (md.results.TransientSolution(1).Enthalpy),... + (md.results.TransientSolution(1).Waterfraction),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(2).Enthalpy),... + (md.results.TransientSolution(2).Waterfraction),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(3).Enthalpy),... + (md.results.TransientSolution(3).Waterfraction),... + (md.results.TransientSolution(3).Temperature),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test122.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.m (revision 12787) +++ /issm/trunk-jpl/test/NightlyRun/test122.m (revision 12788) @@ -4,16 +4,18 @@ 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_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; 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}; + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... (md.results.TransientSolution(1).Vx),... @@ -26,5 +28,6 @@ (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(1).Enthalpy),... + (md.results.TransientSolution(1).Waterfraction),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -36,5 +39,6 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Enthalpy),... + (md.results.TransientSolution(2).Waterfraction),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... @@ -46,4 +50,5 @@ (md.results.TransientSolution(3).Thickness),... (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).Enthalpy),... + (md.results.TransientSolution(3).Waterfraction),... }; Index: sm/trunk-jpl/test/NightlyRun/test124.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.m (revision 12787) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... - (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... - }; Index: sm/trunk-jpl/test/NightlyRun/test126.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test126.m (revision 12787) +++ (revision ) @@ -1,15 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... - (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... - }; Index: sm/trunk-jpl/test/NightlyRun/test128.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test128.m (revision 12787) +++ (revision ) @@ -1,14 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BedSlopeSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'BedSlopeX','BedSlopeY'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.BedSlopeSolution.BedSlopeX),... - (md.results.BedSlopeSolution.BedSlopeY),... - }; Index: sm/trunk-jpl/test/NightlyRun/test130.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test130.m (revision 12787) +++ (revision ) @@ -1,15 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BedSlopeSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'BedSlopeX','BedSlopeY'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.BedSlopeSolution.BedSlopeX),... - (md.results.BedSlopeSolution.BedSlopeY),... - }; Index: sm/trunk-jpl/test/NightlyRun/test132.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test132.m (revision 12787) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -%Add boundary conditions on thickness on the border -pos=find(md.mesh.vertexonboundary); -md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test134.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test134.m (revision 12787) +++ (revision ) @@ -1,17 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,5,1); -%Add boundary conditions on thickness on the border -pos=find(md.mesh.vertexonboundary); -md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test136.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test136.m (revision 12787) +++ (revision ) @@ -1,16 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=meshconvert(md); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md.balancethickness.stabilization=3; -md.initialization.vy=md.initialization.vy+400; -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-13}; -field_values={... - (md.results.BalancethicknessSolution.Thickness),... - }; Index: sm/trunk-jpl/test/NightlyRun/test137.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test137.m (revision 12787) +++ (revision ) @@ -1,25 +1,0 @@ - -%Simple mesh -md=bamg(model,'domain','../Exp/Square.exp','hmax',100000); -x1=md.mesh.x; -y1=md.mesh.y; - -%hVertices -md=bamg(model,'domain','../Exp/Square.exp','hmax',300000,'hvertices',[10000 100000 400000 100000]'); -x2=md.mesh.x; -y2=md.mesh.y; - -%big mesh -t0=clock; -md=bamg(model,'domain','../Exp/Square.exp','hmax',3000); -nbelements=md.mesh.numberofelements; -elapsedtime=etime(clock,t0); - -%Fields and tolerances to track changes -field_names ={'x1' 'y1' 'x2' 'y2' 'nbelements' 'elapsed time'}; -field_tolerances={1e-13 1e-13 1e-13 1e-13 1e-13 0.5}; -field_values={... - x1, y1,... - x2, y2,... - nbelements,elapsedtime... - }; Index: sm/trunk-jpl/test/NightlyRun/test140.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test140.m (revision 12787) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; -md.cluster=generic('name',oshostname(),'np',3); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,EnthalpySolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy','Waterfraction','Temperature'}; -field_tolerances={1e-13,1e-10,1e-13}; -field_values={... - (md.results.EnthalpySolution.Enthalpy),... - (md.results.EnthalpySolution.Waterfraction),... - (md.results.EnthalpySolution.Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test142.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test142.m (revision 12787) +++ (revision ) @@ -1,30 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md.thermal.isenthalpy=1; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Enthalpy1','Waterfraction1','Temperature1',... - 'Enthalpy2','Waterfraction2','Temperature2',... - 'Enthalpy3','Waterfraction3','Temperature3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13}; -field_values={... - (md.results.TransientSolution(1).Enthalpy),... - (md.results.TransientSolution(1).Waterfraction),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(2).Enthalpy),... - (md.results.TransientSolution(2).Waterfraction),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(3).Enthalpy),... - (md.results.TransientSolution(3).Waterfraction),... - (md.results.TransientSolution(3).Temperature),... - }; Index: sm/trunk-jpl/test/NightlyRun/test144.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test144.m (revision 12787) +++ (revision ) @@ -1,54 +1,0 @@ -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','Enthalpy1','Waterfraction1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; -field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; -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),... - };