Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12805) @@ -125,20 +125,20 @@ case 431, name='SquareSheetShelfSteaEnthalpyM3d'; case 432, name='SquareSheetShelfSteaEnthalpyP3d'; - case 502, name='PigDiagM2d'; - case 504, name='PigDiagP3d'; - case 506, name='PigDiagS3d'; - case 508, name='PigTranM2d'; - case 510, name='PigTranM3d'; - case 512, name='PigTranP3d'; - case 514, name='PigTranS3d'; - case 516, name='PigSteaM3d'; - case 518, name='PigSteaP3d'; - case 520, name='PigSteaS3d'; - case 522, name='PigCMBS3d'; - case 524, name='PigCMDragP3d'; - case 526, name='PigCMDragSteaM3d'; - case 527, name='PigBamgMesh'; - case 530, name='PigTherTranSUPG'; - case 532, name='PigTherSteaSUPG'; + case 501, name='PigDiagM2d'; + case 502, name='PigDiagP3d'; + case 503, name='PigDiagS3d'; + case 504, name='PigTranM2d'; + case 505, name='PigTranM3d'; + case 506, name='PigTranP3d'; + case 507, name='PigTranS3d'; + case 508, name='PigSteaM3d'; + case 509, name='PigSteaP3d'; + case 510, name='PigSteaS3d'; + case 511, name='PigCMBS3d'; + case 512, name='PigCMDragP3d'; + case 513, name='PigCMDragSteaM3d'; + case 514, name='PigBamgMesh'; + case 515, name='PigTherTranSUPG'; + case 516, name='PigTherSteaSUPG'; case 602, name='79NorthProg2d'; case 604, name='79NorthProg2dDG'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12805) @@ -127,20 +127,20 @@ 431 : 'SquareSheetShelfSteaEnthalpyM3d', 432 : 'SquareSheetShelfSteaEnthalpyP3d', - 502 : 'PigDiagM2d', - 504 : 'PigDiagP3d', - 506 : 'PigDiagS3d', - 508 : 'PigTranM2d', - 510 : 'PigTranM3d', - 512 : 'PigTranP3d', - 514 : 'PigTranS3d', - 516 : 'PigSteaM3d', - 518 : 'PigSteaP3d', - 520 : 'PigSteaS3d', - 522 : 'PigCMBS3d', - 524 : 'PigCMDragP3d', - 526 : 'PigCMDragSteaM3d', - 527 : 'PigBamgMesh', - 530 : 'PigTherTranSUPG', - 532 : 'PigTherSteaSUPG', + 501 : 'PigDiagM2d', + 502 : 'PigDiagP3d', + 503 : 'PigDiagS3d', + 504 : 'PigTranM2d', + 505 : 'PigTranM3d', + 506 : 'PigTranP3d', + 507 : 'PigTranS3d', + 508 : 'PigSteaM3d', + 509 : 'PigSteaP3d', + 510 : 'PigSteaS3d', + 511 : 'PigCMBS3d', + 512 : 'PigCMDragP3d', + 513 : 'PigCMDragSteaM3d', + 514 : 'PigBamgMesh', + 515 : 'PigTherTranSUPG', + 516 : 'PigTherSteaSUPG', 602 : '79NorthProg2d', 604 : '79NorthProg2dDG', Index: /issm/trunk-jpl/test/NightlyRun/test501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test501.m (revision 12805) @@ -0,0 +1,16 @@ +md=triangle(model,'../Exp/Pig.exp',20000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vel','Pressure'}; +field_tolerances={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),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test502.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test502.m (revision 12805) @@ -2,14 +2,16 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=setflowequation(md,'macayeal','all'); +md=extrude(md,3,0.9); +md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; field_values={... (md.results.DiagnosticSolution.Vx),... (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vz),... (md.results.DiagnosticSolution.Vel),... (md.results.DiagnosticSolution.Pressure),... Index: /issm/trunk-jpl/test/NightlyRun/test503.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test503.m (revision 12805) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Pig.exp',20000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,3,0.9); +md=setflowequation(md,'stokes','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={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),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test504.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test504.m (revision 12805) @@ -2,17 +2,25 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,0.9); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; +field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2'}; +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}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (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),... }; Index: /issm/trunk-jpl/test/NightlyRun/test505.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test505.m (revision 12805) @@ -0,0 +1,34 @@ +md=triangle(model,'../Exp/Pig.exp',30000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','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'}; +field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +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),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test506.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test506.m (revision 12805) @@ -1,18 +1,35 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',30000); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,0.9); -md=setflowequation(md,'stokes','all'); +md=extrude(md,2,1); +md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; +field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,1e-12,1e-11,1e-12,1e-12,... + 1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,1e-08}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (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),... }; Index: /issm/trunk-jpl/test/NightlyRun/test507.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test507.m (revision 12805) @@ -0,0 +1,35 @@ +md=triangle(model,'../Exp/Pig.exp',30000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,2,1); +md=setflowequation(md,'stokes','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +%The thickness wants to be lower than 1 so we contrain it to 1 +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; +field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06}; +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),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test508.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test508.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test508.m (revision 12805) @@ -1,26 +1,22 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',30000); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,4,1.1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md.timestepping.time_step=0; +md=solve(md,SteadystateSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2'}; -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}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08 +}; 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.SteadystateSolution.Vx),... + (md.results.SteadystateSolution.Vy),... + (md.results.SteadystateSolution.Vz),... + (md.results.SteadystateSolution.Vel),... + (md.results.SteadystateSolution.Pressure),... + (md.results.SteadystateSolution.Temperature),... + (md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test509.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test509.m (revision 12805) @@ -0,0 +1,22 @@ +md=triangle(model,'../Exp/Pig.exp',30000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.timestepping.time_step=0; +md=solve(md,SteadystateSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 +}; +field_values={... + (md.results.SteadystateSolution.Vx),... + (md.results.SteadystateSolution.Vy),... + (md.results.SteadystateSolution.Vz),... + (md.results.SteadystateSolution.Vel),... + (md.results.SteadystateSolution.Pressure),... + (md.results.SteadystateSolution.Temperature),... + (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test510.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test510.m (revision 12805) @@ -1,34 +1,22 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',20000); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); +md=extrude(md,2,1); +md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md.timestepping.time_step=0; +md=solve(md,SteadystateSolutionEnum); %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'}; -field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 +}; 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.SteadystateSolution.Vx),... + (md.results.SteadystateSolution.Vy),... + (md.results.SteadystateSolution.Vz),... + (md.results.SteadystateSolution.Vel),... + (md.results.SteadystateSolution.Pressure),... + (md.results.SteadystateSolution.Temperature),... + (md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test511.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test511.m (revision 12805) @@ -0,0 +1,39 @@ +md=triangle(model,'../Exp/Pig.exp',10000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); + +%impose hydrostatic equilibrium (required by Stokes) +md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md=extrude(md,3,1); +md=setflowequation(md,'stokes','all'); +md=modelextract(md,md.mask.elementonfloatingice); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'MaterialsRheologyBbar'}; +md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.gradient_scaling=10^8*ones(md.inversion.nsteps,1); +md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); +md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; +field_values={... + (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.MaterialsRheologyB),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test512.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test512.m (revision 12805) @@ -1,35 +1,34 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',20000); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); +md=extrude(md,3,1); md=setflowequation(md,'pattyn','all'); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'FrictionCoefficient'}; +md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; +md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); +md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); +md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %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'}; -field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,1e-12,1e-11,1e-12,1e-12,... - 1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,1e-08}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; 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.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.FrictionCoefficient),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test513.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test513.m (revision 12805) @@ -0,0 +1,39 @@ +md=triangle(model,'../Exp/Pig.exp',30000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'FrictionCoefficient'}; +md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; +md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); +md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); +md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; +md.timestepping.time_step=0; + +md.thermal.penalty_lock=5; +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,SteadystateSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; +field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06}; +field_values={... + (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... + (md.results.SteadystateSolution.FrictionCoefficient),... + (md.results.SteadystateSolution.Pressure),... + (md.results.SteadystateSolution.Vel),... + (md.results.SteadystateSolution.Vx),... + (md.results.SteadystateSolution.Vy),... + (md.results.SteadystateSolution.Vz),... + (md.results.SteadystateSolution.Temperature),... + (md.results.SteadystateSolution.BasalforcingsMeltingRate) +}; Index: /issm/trunk-jpl/test/NightlyRun/test514.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test514.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test514.m (revision 12805) @@ -1,35 +1,56 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +%Simple mesh 1 +hVertices=10000*ones(27,1); +hVertices(1:5)=1000; +md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000,'hVertices',hVertices,'gradation',3,'geometricalmetric',1); +x1=md.mesh.x; +y1=md.mesh.y; + +%Simple mesh 2 +md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','all'); -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +x2=md.mesh.x; +y2=md.mesh.y; + +%refine existing mesh 1 +hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,md.inversion.vy_obs,'node'); +metric=ComputeMetric(hessian,2/9,1,1000,25*10^3,[]); +md.miscellaneous.dummy=metric; +md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1); +x3=md2.mesh.x; +y3=md2.mesh.y; + +%refine existing mesh 2 +md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1); +x4=md2.mesh.x; +y4=md2.mesh.y; + +%refine existing mesh 3 +hVertices=NaN*ones(md.mesh.numberofvertices,1); +hVertices(find(md.mesh.vertexonboundary))=500; +md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices); +x5=md2.mesh.x; +y5=md2.mesh.y; + +%refine existing mesh 4 +md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',0,'err',1); +x6=md2.mesh.x; +y6=md2.mesh.y; + +%refine existing mesh 5 +md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',1,'err',[10 100]); +x7=md2.mesh.x; +y7=md2.mesh.y; %Fields and tolerances to track changes -%The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06}; +field_names ={'x1' 'y1' 'x2' 'y2' 'x3' 'y3' 'x4' 'y4' 'x5' 'y5' 'x6' 'y6' 'x7' 'y7' }; +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}; 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),... + x1, y1,... + y2, y2,... + y3, y3,... + y4, y4,... + y5, y5,... + y6, y6,... + y7, y7,... }; Index: /issm/trunk-jpl/test/NightlyRun/test515.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.m (revision 12805) +++ /issm/trunk-jpl/test/NightlyRun/test515.m (revision 12805) @@ -0,0 +1,23 @@ +md=triangle(model,'../Exp/Pig.exp',30000); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=parameterize(md,'../Par/Pig.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.thermal.stabilization=2; +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 ={'Temperature1','BasalforcingsMeltingRate1', ... + 'Temperature2','BasalforcingsMeltingRate2'}; +field_tolerances={1e-13,1e-8,1e-13,1e-8}; +field_values={... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test516.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test516.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test516.m (revision 12805) @@ -2,21 +2,17 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,4,1.1); -md=setflowequation(md,'macayeal','all'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.thermal.stabilization=2; md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md.thermal.penalty_threshold=40; +md=solve(md,ThermalSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08 -}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-11,1e-11}; field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + (md.results.ThermalSolution.Temperature),... + (md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: sm/trunk-jpl/test/NightlyRun/test518.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test518.m (revision 12804) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test520.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test520.m (revision 12804) +++ (revision ) @@ -1,22 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 -}; -field_values={... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test522.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test522.m (revision 12804) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',10000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); - -%impose hydrostatic equilibrium (required by Stokes) -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md=modelextract(md,md.mask.elementonfloatingice); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^8*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test524.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test524.m (revision 12804) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',20000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; -field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.FrictionCoefficient),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; Index: sm/trunk-jpl/test/NightlyRun/test526.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test526.m (revision 12804) +++ (revision ) @@ -1,39 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); -md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; -md.timestepping.time_step=0; - -md.thermal.penalty_lock=5; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; -field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06}; -field_values={... - (md.results.SteadystateSolution.Gradient1),... - md.results.SteadystateSolution.J,... - (md.results.SteadystateSolution.FrictionCoefficient),... - (md.results.SteadystateSolution.Pressure),... - (md.results.SteadystateSolution.Vel),... - (md.results.SteadystateSolution.Vx),... - (md.results.SteadystateSolution.Vy),... - (md.results.SteadystateSolution.Vz),... - (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate) -}; Index: sm/trunk-jpl/test/NightlyRun/test527.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test527.m (revision 12804) +++ (revision ) @@ -1,56 +1,0 @@ -%Simple mesh 1 -hVertices=10000*ones(27,1); -hVertices(1:5)=1000; -md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000,'hVertices',hVertices,'gradation',3,'geometricalmetric',1); -x1=md.mesh.x; -y1=md.mesh.y; - -%Simple mesh 2 -md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -x2=md.mesh.x; -y2=md.mesh.y; - -%refine existing mesh 1 -hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,md.inversion.vy_obs,'node'); -metric=ComputeMetric(hessian,2/9,1,1000,25*10^3,[]); -md.miscellaneous.dummy=metric; -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1); -x3=md2.mesh.x; -y3=md2.mesh.y; - -%refine existing mesh 2 -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1); -x4=md2.mesh.x; -y4=md2.mesh.y; - -%refine existing mesh 3 -hVertices=NaN*ones(md.mesh.numberofvertices,1); -hVertices(find(md.mesh.vertexonboundary))=500; -md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices); -x5=md2.mesh.x; -y5=md2.mesh.y; - -%refine existing mesh 4 -md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',0,'err',1); -x6=md2.mesh.x; -y6=md2.mesh.y; - -%refine existing mesh 5 -md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',1,'err',[10 100]); -x7=md2.mesh.x; -y7=md2.mesh.y; - -%Fields and tolerances to track changes -field_names ={'x1' 'y1' 'x2' 'y2' 'x3' 'y3' 'x4' 'y4' 'x5' 'y5' 'x6' 'y6' 'x7' 'y7' }; -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}; -field_values={... - x1, y1,... - y2, y2,... - y3, y3,... - y4, y4,... - y5, y5,... - y6, y6,... - y7, y7,... - }; Index: sm/trunk-jpl/test/NightlyRun/test530.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test530.m (revision 12804) +++ (revision ) @@ -1,23 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.thermal.stabilization=2; -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 ={'Temperature1','BasalforcingsMeltingRate1', ... - 'Temperature2','BasalforcingsMeltingRate2'}; -field_tolerances={1e-13,1e-8,1e-13,1e-8}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test532.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test532.m (revision 12804) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Pig.exp',30000); -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); -md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.thermal.stabilization=2; -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md.thermal.penalty_threshold=40; -md=solve(md,ThermalSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-11,1e-11}; -field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - };