Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12804) @@ -93,37 +93,36 @@ case 328, name='SquareSheetConstrainedSmbGradients2d'; case 329, name='SquareSheetConstrainedSmbGradients3d'; - case 402, name='SquareSheetShelfDiagM2d'; - case 404, name='SquareSheetShelfDiagM3d'; - case 406, name='SquareSheetShelfDiagP3d'; - case 408, name='SquareSheetShelfDiagS3d'; - case 410, name='SquareSheetShelfDiagMP3dPenalties'; - case 412, name='SquareSheetShelfTherStea'; - case 414, name='SquareSheetShelfTherTran'; - case 416, name='SquareSheetShelfTranM2d'; - case 418, name='SquareSheetShelfTranMP3dPenalties'; - case 420, name='SquareSheetShelfSteaM3d'; - case 422, name='SquareSheetShelfSteaP3d'; - case 424, name='SquareSheetShelfDiadM3dDakota'; - case 426, name='SquareSheetShelfDiadM3dDakotaPart'; - case 428, name='SquareSheetShelfDiadM3dDakotaMassFlux'; - case 430, name='SquareSheetShelfCMDragSteaM3d'; - case 432, name='SquareSheetShelfCMDragSteaP3d'; - case 434, name='SquareSheetShelfDiadM3dDakotaSamp'; - case 436, name='SquareSheetShelfDiadM3dDakotaAreaAverage'; - case 438, name='SquareSheetShelfDiagMP3dTiling'; - case 439, name='SquareSheetShelfDakotaScaledResponse'; - case 440, name='SquareSheetShelfDakotaScaledResponse'; - case 442, name='SquareSheetShelfDiagPS3dTiling'; - case 444, name='SquareSheetShelfDiagMS3dTiling'; - case 446, name='RoundSheetShelfGLMigrationM2d'; - case 448, name='SquareSheetShelfGroundingLine2dAgressice'; - case 450, name='SquareSheetShelfGroundingLine2dSoft'; - case 452, name='SquareSheetShelfGroundingLine3dAgressice'; - case 454, name='SquareSheetShelfGroundingLine3dSoft'; - case 456, name='SquareSheetShelfDiagM2dNewton'; - case 458, name='SquareSheetShelfDiagP3dNewton'; - case 460, name='SquareSheetShelfDiagS3dNewton'; - case 462, name='SquareSheetShelfSteaEnthalpyM3d'; - case 464, name='SquareSheetShelfSteaEnthalpyP3d'; + case 401, name='SquareSheetShelfDiagM2d'; + case 402, name='SquareSheetShelfDiagM3d'; + case 403, name='SquareSheetShelfDiagP3d'; + case 404, name='SquareSheetShelfDiagS3d'; + case 405, name='SquareSheetShelfDiagMP3dPenalties'; + case 406, name='SquareSheetShelfTherStea'; + case 407, name='SquareSheetShelfTherTran'; + case 408, name='SquareSheetShelfTranM2d'; + case 409, name='SquareSheetShelfTranMP3dPenalties'; + case 410, name='SquareSheetShelfSteaM3d'; + case 411, name='SquareSheetShelfSteaP3d'; + case 412, name='SquareSheetShelfDiadM3dDakota'; + case 413, name='SquareSheetShelfDiadM3dDakotaPart'; + case 414, name='SquareSheetShelfDiadM3dDakotaMassFlux'; + case 415, name='SquareSheetShelfCMDragSteaM3d'; + case 416, name='SquareSheetShelfCMDragSteaP3d'; + case 417, name='SquareSheetShelfDiadM3dDakotaSamp'; + case 418, name='SquareSheetShelfDiadM3dDakotaAreaAverage'; + case 419, name='SquareSheetShelfDiagMP3dTiling'; + case 420, name='SquareSheetShelfDakotaScaledResponse'; + case 421, name='SquareSheetShelfDiagPS3dTiling'; + case 422, name='SquareSheetShelfDiagMS3dTiling'; + case 423, name='RoundSheetShelfGLMigrationM2d'; + case 424, name='SquareSheetShelfGroundingLine2dAgressice'; + case 425, name='SquareSheetShelfGroundingLine2dSoft'; + case 426, name='SquareSheetShelfGroundingLine3dAgressice'; + case 427, name='SquareSheetShelfGroundingLine3dSoft'; + case 428, name='SquareSheetShelfDiagM2dNewton'; + case 429, name='SquareSheetShelfDiagP3dNewton'; + case 430, name='SquareSheetShelfDiagS3dNewton'; + case 431, name='SquareSheetShelfSteaEnthalpyM3d'; + case 432, name='SquareSheetShelfSteaEnthalpyP3d'; case 502, name='PigDiagM2d'; case 504, name='PigDiagP3d'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 12804) @@ -95,37 +95,36 @@ 328 : 'SquareSheetConstrainedSmbGradients2d'; 329 : 'SquareSheetConstrainedSmbGradients3d'; - 402 : 'SquareSheetShelfDiagM2d', - 404 : 'SquareSheetShelfDiagM3d', - 406 : 'SquareSheetShelfDiagP3d', - 408 : 'SquareSheetShelfDiagS3d', - 410 : 'SquareSheetShelfDiagMP3dPenalties', - 412 : 'SquareSheetShelfTherStea', - 414 : 'SquareSheetShelfTherTran', - 416 : 'SquareSheetShelfTranM2d', - 418 : 'SquareSheetShelfTranMP3dPenalties', - 420 : 'SquareSheetShelfSteaM3d', - 422 : 'SquareSheetShelfSteaP3d', - 424 : 'SquareSheetShelfDiadM3dDakota', - 426 : 'SquareSheetShelfDiadM3dDakotaPart', - 428 : 'SquareSheetShelfDiadM3dDakotaMassFlux', - 430 : 'SquareSheetShelfCMDragSteaM3d', - 432 : 'SquareSheetShelfCMDragSteaP3d', - 434 : 'SquareSheetShelfDiadM3dDakotaSamp', - 435 : 'SquareSheetShelfDiadM3dDakotaAreaAverage', - 438 : 'SquareSheetShelfDiagMP3dTiling', - 439 : 'SquareSheetShelfDakotaScaledResponse', - 440 : 'SquareSheetShelfDakotaScaledResponse', - 442 : 'SquareSheetShelfDiagPS3dTiling', - 444 : 'SquareSheetShelfDiagMS3dTiling', - 446 : 'RoundSheetShelfGLMigrationM2d', - 448 : 'SquareSheetShelfGroundingLine2dAgressice', - 450 : 'SquareSheetShelfGroundingLine2dSoft', - 452 : 'SquareSheetShelfGroundingLine3dAgressice', - 454 : 'SquareSheetShelfGroundingLine3dSoft', - 456 : 'SquareSheetShelfDiagM2dNewton', - 458 : 'SquareSheetShelfDiagP3dNewton', - 460 : 'SquareSheetShelfDiagS3dNewton', - 462 : 'SquareSheetShelfSteaEnthalpyM3d', - 464 : 'SquareSheetShelfSteaEnthalpyP3d', + 401 : 'SquareSheetShelfDiagM2d', + 402 : 'SquareSheetShelfDiagM3d', + 403 : 'SquareSheetShelfDiagP3d', + 404 : 'SquareSheetShelfDiagS3d', + 405 : 'SquareSheetShelfDiagMP3dPenalties', + 406 : 'SquareSheetShelfTherStea', + 407 : 'SquareSheetShelfTherTran', + 408 : 'SquareSheetShelfTranM2d', + 409 : 'SquareSheetShelfTranMP3dPenalties', + 410 : 'SquareSheetShelfSteaM3d', + 411 : 'SquareSheetShelfSteaP3d', + 412 : 'SquareSheetShelfDiadM3dDakota', + 413 : 'SquareSheetShelfDiadM3dDakotaPart', + 414 : 'SquareSheetShelfDiadM3dDakotaMassFlux', + 415 : 'SquareSheetShelfCMDragSteaM3d', + 416 : 'SquareSheetShelfCMDragSteaP3d', + 417 : 'SquareSheetShelfDiadM3dDakotaSamp', + 418 : 'SquareSheetShelfDiadM3dDakotaAreaAverage', + 419 : 'SquareSheetShelfDiagMP3dTiling', + 420 : 'SquareSheetShelfDakotaScaledResponse', + 421 : 'SquareSheetShelfDiagPS3dTiling', + 422 : 'SquareSheetShelfDiagMS3dTiling', + 423 : 'RoundSheetShelfGLMigrationM2d', + 424 : 'SquareSheetShelfGroundingLine2dAgressice', + 425 : 'SquareSheetShelfGroundingLine2dSoft', + 426 : 'SquareSheetShelfGroundingLine3dAgressice', + 427 : 'SquareSheetShelfGroundingLine3dSoft', + 428 : 'SquareSheetShelfDiagM2dNewton', + 439 : 'SquareSheetShelfDiagP3dNewton', + 430 : 'SquareSheetShelfDiagS3dNewton', + 431 : 'SquareSheetShelfSteaEnthalpyM3d', + 432 : 'SquareSheetShelfSteaEnthalpyP3d', 502 : 'PigDiagM2d', 504 : 'PigDiagP3d', Index: /issm/trunk-jpl/test/NightlyRun/test401.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test401.m (revision 12804) @@ -0,0 +1,16 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.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/test402.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test402.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test402.m (revision 12804) @@ -2,4 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,4,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); @@ -7,9 +8,10 @@ %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-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),... Index: /issm/trunk-jpl/test/NightlyRun/test403.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test403.m (revision 12804) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,5,1); +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','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/test404.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test404.m (revision 12804) @@ -1,7 +1,7 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'macayeal','all'); +md=extrude(md,3,1); +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-07,1e-07,1e-06,1e-07,1e-07}; field_values={... (md.results.DiagnosticSolution.Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test405.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test405.m (revision 12804) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,5,1); +md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +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-05,1e-05,1e-05,1e-05,1e-05}; +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/test406.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test406.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test406.m (revision 12804) @@ -1,18 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); +md=extrude(md,4,1); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md.timestepping.time_step=0; +md=solve(md,ThermalSolutionEnum); %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 ={'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/test407.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test407.m (revision 12804) @@ -0,0 +1,19 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,4,1); +md=setflowequation(md,'pattyn','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/test408.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test408.m (revision 12804) @@ -1,18 +1,33 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','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-07,1e-07,1e-06,1e-07,1e-07}; +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.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),... + (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/test409.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test409.m (revision 12804) @@ -0,0 +1,48 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +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-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,... + 1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,... + 1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01}; +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/test410.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test410.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test410.m (revision 12804) @@ -1,18 +1,21 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +md=extrude(md,3,2); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md.timestepping.time_step=0; +md=solve(md,SteadystateSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; +field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-06}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (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/test411.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test411.m (revision 12804) @@ -0,0 +1,22 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,3,2); +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-08,1e-09,1e-09,1e-08,1e-05 +}; +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/test412.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test412.m (revision 12804) @@ -1,16 +1,44 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',300000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,ThermalSolutionEnum); + +%partitioning +md.qmu.numberofpartitions=md.mesh.numberofvertices; +md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); +md.qmu.partition=md.qmu.partition-1; +md.qmu.isdakota=1; + + +%Dakota options +%variables +md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); +md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); + +%responses +md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + +%method +md.qmu.method =dakota_method('nond_l'); + +%parameters +md.qmu.params.direct=true; +md.qmu.params.analysis_driver='diagnostic'; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; + +%imperative! +md.diagnostic.reltol=10^-5; %tighten for qmu analysese + +%solve +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +md=tres(md,'dakota'); +md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; +field_names ={'importancefactors'}; +field_tolerances={1e-10}; field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... + md.results.dakota.importancefactors,... }; Index: /issm/trunk-jpl/test/NightlyRun/test413.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test413.m (revision 12804) @@ -0,0 +1,45 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +%Dakota options + +%partitioning +md.qmu.numberofpartitions=20; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); +md.qmu.partition=md.qmu.partition-1; + +%variables +md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); +md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); + +%responses +md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + +%method +md.qmu.method =dakota_method('nond_l'); + +%parameters +md.qmu.params.direct=true; +md.qmu.params.analysis_driver='diagnostic'; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; + + +%imperative! +md.diagnostic.reltol=10^-5; %tighten for qmu analyses +md.qmu.isdakota=1; + +%solve +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); + +%Fields and tolerances to track changes +md=tres(md,'dakota'); +md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; +field_names ={'importancefactors'}; +field_tolerances={1e-10}; +field_values={... + md.results.dakota.importancefactors,... + }; Index: /issm/trunk-jpl/test/NightlyRun/test414.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test414.m (revision 12804) @@ -2,18 +2,69 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,4,1); -md=setflowequation(md,'pattyn','all'); +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.materials.rho_ice=10^7; %involved in the mass flux, make it easy +md.geometry.thickness(:)=1; %make it easy + +%constrain all velocities to 1 m/yr, in the y-direction +md.diagnostic.spcvx=zeros(md.mesh.numberofvertices,1); +md.diagnostic.spcvy=ones(md.mesh.numberofvertices,1); +md.diagnostic.spcvz=zeros(md.mesh.numberofvertices,1); + +%Dakota options + +%partitioning +md.qmu.numberofpartitions=20; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); +md.qmu.partition=md.qmu.partition-1; + +%variables +md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); + +%responses +md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + +%mass flux profiles +md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'}; +md.qmu.mass_flux_profile_directory=pwd; + +%method +md.qmu.method =dakota_method('nond_l'); + +%parameters +md.qmu.params.direct=true; +md.qmu.params.analysis_driver='diagnostic'; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; +md.qmu.isdakota=1; +md.diagnostic.reltol=10^-5; %tighten for qmu analyses + +%solve +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=tres(md,'dakota'); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr +%we recover those mass fluxes through the mean of the response. +%also, we recover the max velo, which should be 1m/yr. +%we put all that data in the importancefactors, which we will use to test for success. +%also, check that the stddev are 0. +md.results.dakota.importancefactors=[]; +for i=1:8, + md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).mean]; +end +for i=1:8, + md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).stddev]; +end +field_names ={'importancefactors'}; +field_tolerances={1e-11}; field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + md.results.dakota.importancefactors,... }; Index: /issm/trunk-jpl/test/NightlyRun/test415.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test415.m (revision 12804) @@ -0,0 +1,38 @@ +md=triangle(model,'../Exp/Square.exp',170000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.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.3*ones(md.inversion.nsteps,1); +md.timestepping.time_step=0; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + +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-11,1e-13,1e-10,1e-09,1e-10,1e-8,1e-09,1e-6}; +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/test416.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test416.m (revision 12804) @@ -1,33 +1,38 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',170000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +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=[102*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.3*ones(md.inversion.nsteps,1); +md.timestepping.time_step=0; +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,SteadystateSolutionEnum); %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 ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; +field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05}; 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.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/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test417.m (revision 12804) @@ -0,0 +1,73 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.materials.rho_ice=10^7; %involved in the mass flux, make it easy +md.geometry.thickness(:)=1; %make it easy + +%constrain all velocities to 1 m/yr, in the y-direction +md.diagnostic.spcvx(:)=0; +md.diagnostic.spcvy(:)=1; +md.diagnostic.spcvz(:)=0; + +%Dakota options +md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); + +md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); +md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + +%mass flux profiles +md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'}; +md.qmu.mass_flux_profile_directory=pwd; + + +%% nond_sampling study + +md.qmu.method =dakota_method('nond_samp'); +md.qmu.method(end)=dmeth_params_set(md.qmu.method(end),... +'seed',1234,... +'samples',20,... +'sample_type','lhs'); + +%% a variety of parameters +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.analysis_driver=''; +md.qmu.params.analysis_components=''; + +%partitioning +md.qmu.numberofpartitions=20; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); +md.qmu.partition=md.qmu.partition-1; +md.qmu.isdakota=1; + +md.diagnostic.reltol=10^-5; %tighten for qmu analyses + +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); + +%Fields and tolerances to track changes +md=tres(md,'dakota'); + +%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr +%we recover those mass fluxes through the mean of the response. +%also, we recover the max velo, which should be 1m/yr. +%we put all that data in the montecarlo field, which we will use to test for success. +%also, check that the stddev are 0. +md.results.dakota.montecarlo=[]; +for i=1:8, + md.results.dakota.montecarlo=[md.results.dakota.montecarlo md.results.dakota.dresp_out(i).mean]; +end +for i=1:8, + md.results.dakota.montecarlo=[md.results.dakota.montecarlo md.results.dakota.dresp_out(i).stddev]; +end +field_names ={'montecarlo'}; +field_tolerances={1e-11}; +field_values={... + md.results.dakota.montecarlo,... + }; Index: /issm/trunk-jpl/test/NightlyRun/test418.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test418.m (revision 12804) @@ -1,48 +1,21 @@ -md=triangle(model,'../Exp/Square.exp',180000); +%test partitioning, and partition averaging +md=triangle(model,'../Exp/Square.exp',30000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +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', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={... - 1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,... - 1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,... - 1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01}; +%partitioning +md.qmu.numberofpartitions=100; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); +md.qmu.partition=md.qmu.partition-1; + +vector=(1:1:md.mesh.numberofvertices)'; +vector_on_partition=AreaAverageOntoPartition(md,vector); +vector_on_nodes=vector_on_partition(md.qmu.partition+1); + +field_names ={'vector_on_nodes'}; +field_tolerances={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.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),... + vector_on_nodes,... }; Index: /issm/trunk-jpl/test/NightlyRun/test419.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test419.m (revision 12804) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,5,1); +md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn'); +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/test420.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test420.m (revision 12804) @@ -1,21 +1,49 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',200000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); + +%partitioning +md.qmu.numberofpartitions=10; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); +md.qmu.partition=md.qmu.partition-1; +md.qmu.isdakota=1; + +%Dakota options +%variables +md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); + +%responses +md.qmu.responses.MaxVel=response_function('scaled_Thickness',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + +%method +md.qmu.method =dakota_method('nond_l'); + +%parameters +md.qmu.params.direct=true; +md.qmu.params.analysis_driver='diagnostic'; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; + + +%imperative! +md.diagnostic.reltol=10^-5; %tighten for qmu analysese + +%solve +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=tres(md,'dakota'); + +%test on thickness +h=zeros(md.qmu.numberofpartitions,1); +for i=1:md.qmu.numberofpartitions, + h(i)=md.qmu.results.dresp_out(i).mean; +end + +%project onto grid +thickness=h(md.qmu.partition+1); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,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),... - }; +field_names ={'Thickness'}; +field_tolerances={1e-10}; +field_values={thickness}; Index: /issm/trunk-jpl/test/NightlyRun/test421.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test421.m (revision 12804) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,5,1); +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); +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-08,1e-09,1e-05,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/test422.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test422.m (revision 12804) @@ -1,22 +1,19 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); +md=extrude(md,5,1); +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md.diagnostic.reltol=0.4; +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05 -}; +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; 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.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vz),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... }; Index: /issm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 12804) @@ -0,0 +1,37 @@ +radius=1e6; +shelfextent=2e5; + +md=roundmesh(model,radius,50000); +%fix center node to 0,0 +rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); +pos=find(rad==min(rad)); +md.mesh.x(pos)=0; md.mesh.y(pos)=0; %the closest node to the center is changed to be exactly at the center +xelem=md.mesh.x(md.mesh.elements)*[1;1;1]/3; +yelem=md.mesh.y(md.mesh.elements)*[1;1;1]/3; +rad=sqrt(xelem.^2+yelem.^2); +flags=zeros(md.mesh.numberofelements,1); +pos=find(rad>=(radius-shelfextent)); +flags(pos)=1; +md=setmask(md,flags,''); +md=parameterize(md,'../Par/RoundSheetShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +md.transient.isthermal=0; +md.transient.isprognostic=0; +md.transient.isdiagnostic=0; +md.transient.isgroundingline=1; + +%test different grounding line dynamics. +md.groundingline.migration='AgressiveMigration'; +md=solve(md,TransientSolutionEnum); +element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); + +md.groundingline.migration='SoftMigration'; +md=solve(md,TransientSolutionEnum); +element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); + +%Fields and tolerances to track changes +field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft'}; +field_tolerances={1e-13,1e-13}; +field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft}; Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 12804) @@ -1,44 +1,40 @@ -md=triangle(model,'../Exp/Square.exp',300000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setflowequation(md,'macayeal','all'); +md.initialization.vx(:)=0; +md.initialization.vy(:)=0; +md.initialization.vel(:)=0; +md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; +md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; +md.geometry.thickness(:)=1000; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md.surfaceforcings.mass_balance(:)=100; +md.transient.isdiagnostic=0; +md.transient.isgroundingline=1; +md.groundingline.migration='AgressiveMigration'; + md.cluster=generic('name',oshostname(),'np',3); - -%partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; -md.qmu.isdakota=1; - - -%Dakota options -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analysese - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; +field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... + 'Bed2','Surface2','Thickness2','Floatingice2',... + 'Bed3','Surface3','Thickness3','Floatingice3'}; +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}; field_values={... - md.results.dakota.importancefactors,... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskElementonfloatingice),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskElementonfloatingice),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskElementonfloatingice),... }; Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 12804) @@ -0,0 +1,40 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.initialization.vx(:)=0; +md.initialization.vy(:)=0; +md.initialization.vel(:)=0; +md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; +md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; +md.geometry.thickness(:)=1300; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md.surfaceforcings.mass_balance(:)=-150; +md.transient.isdiagnostic=0; +md.transient.isgroundingline=1; +md.groundingline.migration='SoftMigration'; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... + 'Bed2','Surface2','Thickness2','Floatingice2',... + 'Bed3','Surface3','Thickness3','Floatingice3'}; +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}; +field_values={... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskElementonfloatingice),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskElementonfloatingice),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 12804) @@ -1,45 +1,42 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',350000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.initialization.vx(:)=0; +md.initialization.vy(:)=0; +md.initialization.vel(:)=0; +md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; +md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; +md.geometry.thickness(:)=1000; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md.surfaceforcings.mass_balance(:)=100; +md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); + +md.transient.isdiagnostic=0; +md.transient.isgroundingline=1; +md.groundingline.migration='AgressiveMigration'; md.cluster=generic('name',oshostname(),'np',3); -%Dakota options - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; - -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analyses -md.qmu.isdakota=1; - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; +field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... + 'Bed2','Surface2','Thickness2','Floatingice2',... + 'Bed3','Surface3','Thickness3','Floatingice3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,... + 1e-11,1e-11,1e-11,1e-13,... + 1e-10,1e-10,1e-10,1e-13}; field_values={... - md.results.dakota.importancefactors,... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskElementonfloatingice),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskElementonfloatingice),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskElementonfloatingice),... }; Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 12804) @@ -0,0 +1,41 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.initialization.vx(:)=0; +md.initialization.vy(:)=0; +md.initialization.vel(:)=0; +md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; +md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; +md.geometry.thickness(:)=1300; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; +md=setflowequation(md,'macayeal','all'); +md=extrude(md,3,1); + +md.surfaceforcings.mass_balance(:)=-150; +md.transient.isdiagnostic=0; +md.transient.isgroundingline=1; +md.groundingline.migration='SoftMigration'; +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... + 'Bed2','Surface2','Thickness2','Floatingice2',... + 'Bed3','Surface3','Thickness3','Floatingice3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,... + 1e-10,1e-11,1e-10,1e-13}; +field_values={... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskElementonfloatingice),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskElementonfloatingice),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test428.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test428.m (revision 12804) @@ -3,68 +3,16 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setflowequation(md,'macayeal','all'); +md.diagnostic.isnewton=1; +md.diagnostic.restol=0.0001; md.cluster=generic('name',oshostname(),'np',3); -md.materials.rho_ice=10^7; %involved in the mass flux, make it easy -md.geometry.thickness(:)=1; %make it easy - -%constrain all velocities to 1 m/yr, in the y-direction -md.diagnostic.spcvx=zeros(md.mesh.numberofvertices,1); -md.diagnostic.spcvy=ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvz=zeros(md.mesh.numberofvertices,1); - -%Dakota options - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; - -%variables -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%mass flux profiles -md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'}; -md.qmu.mass_flux_profile_directory=pwd; - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; -md.qmu.isdakota=1; -md.diagnostic.reltol=10^-5; %tighten for qmu analyses - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr -%we recover those mass fluxes through the mean of the response. -%also, we recover the max velo, which should be 1m/yr. -%we put all that data in the importancefactors, which we will use to test for success. -%also, check that the stddev are 0. -md.results.dakota.importancefactors=[]; -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).mean]; -end -for i=1:8, - md.results.dakota.importancefactors=[md.results.dakota.importancefactors md.results.dakota.dresp_out(i).stddev]; -end -field_names ={'importancefactors'}; -field_tolerances={1e-11}; +field_names ={'Vx','Vy','Vel','Pressure'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13}; field_values={... - md.results.dakota.importancefactors,... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... }; Index: /issm/trunk-jpl/test/NightlyRun/test429.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test429.m (revision 12804) @@ -0,0 +1,20 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,5,1); +md=setflowequation(md,'pattyn','all'); +md.diagnostic.isnewton=1; +md.diagnostic.restol=0.0001; +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/test430.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test430.m (revision 12804) @@ -1,38 +1,20 @@ -md=triangle(model,'../Exp/Square.exp',170000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.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.3*ones(md.inversion.nsteps,1); -md.timestepping.time_step=0; -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - +md=setflowequation(md,'stokes','all'); +md.diagnostic.isnewton=1; +md.diagnostic.restol=0.0001; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %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-11,1e-13,1e-10,1e-09,1e-10,1e-8,1e-09,1e-6}; +field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +field_tolerances={1e-07,1e-07,1e-06,1e-07,1e-07}; 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) -}; + (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/test431.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.m (revision 12804) +++ /issm/trunk-jpl/test/NightlyRun/test431.m (revision 12804) @@ -0,0 +1,24 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=extrude(md,3,2); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.timestepping.time_step=0; +md.thermal.isenthalpy=1; +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +md=solve(md,SteadystateSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; +field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-10,1e-10}; +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.Waterfraction),... + (md.results.SteadystateSolution.Enthalpy),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test432.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.m (revision 12803) +++ /issm/trunk-jpl/test/NightlyRun/test432.m (revision 12804) @@ -1,38 +1,24 @@ -md=triangle(model,'../Exp/Square.exp',170000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); +md=extrude(md,3,2); 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=[102*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.3*ones(md.inversion.nsteps,1); +md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; -md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - -md.cluster=generic('name',oshostname(),'np',3); +md.thermal.isenthalpy=1; +md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); 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-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-13,1e-10,1e-10,1e-10}; 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.Vel),... + (md.results.SteadystateSolution.Pressure),... (md.results.SteadystateSolution.Temperature),... - (md.results.SteadystateSolution.BasalforcingsMeltingRate) -}; + (md.results.SteadystateSolution.Waterfraction),... + (md.results.SteadystateSolution.Enthalpy),... + }; Index: sm/trunk-jpl/test/NightlyRun/test434.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test434.m (revision 12803) +++ (revision ) @@ -1,73 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.materials.rho_ice=10^7; %involved in the mass flux, make it easy -md.geometry.thickness(:)=1; %make it easy - -%constrain all velocities to 1 m/yr, in the y-direction -md.diagnostic.spcvx(:)=0; -md.diagnostic.spcvy(:)=1; -md.diagnostic.spcvz(:)=0; - -%Dakota options -md.qmu.variables.drag_coefficient=normal_uncertain('scaled_FrictionCoefficient',1,0.01); - -md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); -md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%mass flux profiles -md.qmu.mass_flux_profiles={'../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'}; -md.qmu.mass_flux_profile_directory=pwd; - - -%% nond_sampling study - -md.qmu.method =dakota_method('nond_samp'); -md.qmu.method(end)=dmeth_params_set(md.qmu.method(end),... -'seed',1234,... -'samples',20,... -'sample_type','lhs'); - -%% a variety of parameters -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.analysis_driver=''; -md.qmu.params.analysis_components=''; - -%partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.partition=md.qmu.partition-1; -md.qmu.isdakota=1; - -md.diagnostic.reltol=10^-5; %tighten for qmu analyses - -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); - -%Fields and tolerances to track changes -md=tres(md,'dakota'); - -%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr -%we recover those mass fluxes through the mean of the response. -%also, we recover the max velo, which should be 1m/yr. -%we put all that data in the montecarlo field, which we will use to test for success. -%also, check that the stddev are 0. -md.results.dakota.montecarlo=[]; -for i=1:8, - md.results.dakota.montecarlo=[md.results.dakota.montecarlo md.results.dakota.dresp_out(i).mean]; -end -for i=1:8, - md.results.dakota.montecarlo=[md.results.dakota.montecarlo md.results.dakota.dresp_out(i).stddev]; -end -field_names ={'montecarlo'}; -field_tolerances={1e-11}; -field_values={... - md.results.dakota.montecarlo,... - }; Index: sm/trunk-jpl/test/NightlyRun/test436.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test436.m (revision 12803) +++ (revision ) @@ -1,21 +1,0 @@ -%test partitioning, and partition averaging -md=triangle(model,'../Exp/Square.exp',30000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -%partitioning -md.qmu.numberofpartitions=100; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; - -vector=(1:1:md.mesh.numberofvertices)'; -vector_on_partition=AreaAverageOntoPartition(md,vector); -vector_on_nodes=vector_on_partition(md.qmu.partition+1); - -field_names ={'vector_on_nodes'}; -field_tolerances={1e-11}; -field_values={... - vector_on_nodes,... - }; Index: sm/trunk-jpl/test/NightlyRun/test438.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test438.m (revision 12803) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn'); -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: sm/trunk-jpl/test/NightlyRun/test440.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test440.m (revision 12803) +++ (revision ) @@ -1,49 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -%partitioning -md.qmu.numberofpartitions=10; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; -md.qmu.isdakota=1; - -%Dakota options -%variables -md.qmu.variables.rho_ice=normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01); - -%responses -md.qmu.responses.MaxVel=response_function('scaled_Thickness',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - -%method -md.qmu.method =dakota_method('nond_l'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver='diagnostic'; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; - - -%imperative! -md.diagnostic.reltol=10^-5; %tighten for qmu analysese - -%solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%test on thickness -h=zeros(md.qmu.numberofpartitions,1); -for i=1:md.qmu.numberofpartitions, - h(i)=md.qmu.results.dresp_out(i).mean; -end - -%project onto grid -thickness=h(md.qmu.partition+1); - -%Fields and tolerances to track changes -field_names ={'Thickness'}; -field_tolerances={1e-10}; -field_values={thickness}; Index: sm/trunk-jpl/test/NightlyRun/test442.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.m (revision 12803) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); -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-08,1e-09,1e-05,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: sm/trunk-jpl/test/NightlyRun/test444.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.m (revision 12803) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); -md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.reltol=0.4; -md=solve(md,DiagnosticSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-09,1e-09,1e-06,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: sm/trunk-jpl/test/NightlyRun/test446.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test446.m (revision 12803) +++ (revision ) @@ -1,37 +1,0 @@ -radius=1e6; -shelfextent=2e5; - -md=roundmesh(model,radius,50000); -%fix center node to 0,0 -rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); -pos=find(rad==min(rad)); -md.mesh.x(pos)=0; md.mesh.y(pos)=0; %the closest node to the center is changed to be exactly at the center -xelem=md.mesh.x(md.mesh.elements)*[1;1;1]/3; -yelem=md.mesh.y(md.mesh.elements)*[1;1;1]/3; -rad=sqrt(xelem.^2+yelem.^2); -flags=zeros(md.mesh.numberofelements,1); -pos=find(rad>=(radius-shelfextent)); -flags(pos)=1; -md=setmask(md,flags,''); -md=parameterize(md,'../Par/RoundSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.transient.isthermal=0; -md.transient.isprognostic=0; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; - -%test different grounding line dynamics. -md.groundingline.migration='AgressiveMigration'; -md=solve(md,TransientSolutionEnum); -element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); - -md.groundingline.migration='SoftMigration'; -md=solve(md,TransientSolutionEnum); -element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); - -%Fields and tolerances to track changes -field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft'}; -field_tolerances={1e-13,1e-13}; -field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft}; Index: sm/trunk-jpl/test/NightlyRun/test448.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test448.m (revision 12803) +++ (revision ) @@ -1,40 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; - -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -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}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test450.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test450.m (revision 12803) +++ (revision ) @@ -1,40 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1300; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=-150; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='SoftMigration'; - -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -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}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test452.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test452.m (revision 12803) +++ (revision ) @@ -1,42 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); - -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='AgressiveMigration'; -md.cluster=generic('name',oshostname(),'np',3); - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-11,1e-11,1e-11,1e-13,... - 1e-10,1e-10,1e-10,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test454.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test454.m (revision 12803) +++ (revision ) @@ -1,41 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1300; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=setflowequation(md,'macayeal','all'); -md=extrude(md,3,1); - -md.surfaceforcings.mass_balance(:)=-150; -md.transient.isdiagnostic=0; -md.transient.isgroundingline=1; -md.groundingline.migration='SoftMigration'; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... - 'Bed2','Surface2','Thickness2','Floatingice2',... - 'Bed3','Surface3','Thickness3','Floatingice3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,... - 1e-10,1e-11,1e-10,1e-13}; -field_values={... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskElementonfloatingice),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskElementonfloatingice),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskElementonfloatingice),... - }; Index: sm/trunk-jpl/test/NightlyRun/test456.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test456.m (revision 12803) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -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: sm/trunk-jpl/test/NightlyRun/test458.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test458.m (revision 12803) +++ (revision ) @@ -1,20 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,5,1); -md=setflowequation(md,'pattyn','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -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: sm/trunk-jpl/test/NightlyRun/test460.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test460.m (revision 12803) +++ (revision ) @@ -1,20 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md.diagnostic.isnewton=1; -md.diagnostic.restol=0.0001; -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-07,1e-07,1e-06,1e-07,1e-07}; -field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... - }; Index: sm/trunk-jpl/test/NightlyRun/test462.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test462.m (revision 12803) +++ (revision ) @@ -1,24 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md.thermal.isenthalpy=1; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; -field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-10,1e-10}; -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.Waterfraction),... - (md.results.SteadystateSolution.Enthalpy),... - }; Index: sm/trunk-jpl/test/NightlyRun/test464.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test464.m (revision 12803) +++ (revision ) @@ -1,24 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'../Exp/SquareShelf.exp',''); -md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md.thermal.isenthalpy=1; -md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-13,1e-10,1e-10,1e-10}; -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.Waterfraction),... - (md.results.SteadystateSolution.Enthalpy),... - };