Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 12791) @@ -29,39 +29,39 @@ case 121, name='SquareShelfConstrainedEnthalpyTran'; case 122, name='SquareShelfConstrainedTransP3dEnth'; - case 202, name='SquareShelfDiagM2d'; - case 204, name='SquareShelfDiagM3d'; - case 206, name='SquareShelfDiagP3d'; - case 208, name='SquareShelfDiagS3d'; - case 210, name='SquareShelfDiagMP3dPenalties'; - case 212, name='SquareShelfTherStea'; - case 214, name='SquareShelfTherTran'; - case 216, name='SquareShelfTranM2d'; - case 218, name='SquareShelfTranM3d'; - case 220, name='SquareShelfTranP3d'; - case 222, name='SquareShelfTranS3d'; - case 224, name='SquareShelfCMBM2d'; - case 226, name='SquareShelfCMBM3d'; - case 228, name='SquareShelfCMBP3d'; - case 230, name='SquareShelfCMBS3d'; - case 232, name='SquareShelfDiagM2dRift'; - case 234, name='SquareShelfConstrained'; - case 236, name='SquareShelfConstrainedDakotaB'; - case 238, name='SquareShelfDiagMP3dTiling'; - case 240, name='SquareShelfDiagPS3dTiling'; - case 242, name='SquareShelfDiagMS3dTiling'; - case 244, name='SquareShelfDiagM2dTransientIncrHydro'; - case 246, name='SquareShelfDiagM2dTransientIncrNonHydro'; - case 248, name='SquareShelfDiagP3dTransientIncrHydro'; - case 250, name='SquareShelfDiagP3dTransientIncrNonHydro'; - case 252, name='SquareShelfTranCflM2d'; - case 254, name='SquareShelfTranCflP3d'; - case 256, name='SquareShelfTranForceNeg2d'; - case 258, name='SquareShelfTranForcePos2d'; - case 260, name='SquareShelfTranForceNeg3d'; - case 262, name='SquareShelfTranForcePos3d'; - case 264, name='SquareShelfTherTranForcTemp'; - case 266, name='SquareShelfTranP3dForcTemp'; - case 268, name='SquareShelfTranForceNeg2dDakotaSamp'; - case 270, name='SquareShelfTranForceNeg2dDakotaLocal'; + case 201, name='SquareShelfDiagM2d'; + case 202, name='SquareShelfDiagM3d'; + case 203, name='SquareShelfDiagP3d'; + case 204, name='SquareShelfDiagS3d'; + case 205, name='SquareShelfDiagMP3dPenalties'; + case 206, name='SquareShelfTherStea'; + case 207, name='SquareShelfTherTran'; + case 208, name='SquareShelfTranM2d'; + case 209, name='SquareShelfTranM3d'; + case 210, name='SquareShelfTranP3d'; + case 211, name='SquareShelfTranS3d'; + case 212, name='SquareShelfCMBM2d'; + case 213, name='SquareShelfCMBM3d'; + case 214, name='SquareShelfCMBP3d'; + case 215, name='SquareShelfCMBS3d'; + case 216, name='SquareShelfDiagM2dRift'; + case 217, name='SquareShelfConstrained'; + case 218, name='SquareShelfConstrainedDakotaB'; + case 219, name='SquareShelfDiagMP3dTiling'; + case 220, name='SquareShelfDiagPS3dTiling'; + case 221, name='SquareShelfDiagMS3dTiling'; + case 222, name='SquareShelfDiagM2dTransientIncrHydro'; + case 223, name='SquareShelfDiagM2dTransientIncrNonHydro'; + case 224, name='SquareShelfDiagP3dTransientIncrHydro'; + case 225, name='SquareShelfDiagP3dTransientIncrNonHydro'; + case 226, name='SquareShelfTranCflM2d'; + case 227, name='SquareShelfTranCflP3d'; + case 228, name='SquareShelfTranForceNeg2d'; + case 229, name='SquareShelfTranForcePos2d'; + case 230, name='SquareShelfTranForceNeg3d'; + case 231, name='SquareShelfTranForcePos3d'; + case 232, name='SquareShelfTherTranForcTemp'; + case 233, name='SquareShelfTranP3dForcTemp'; + case 234, name='SquareShelfTranForceNeg2dDakotaSamp'; + case 235, name='SquareShelfTranForceNeg2dDakotaLocal'; case 302, name='SquareSheetConstrainedDiagM2d'; case 304, name='SquareSheetConstrainedDiagH2d'; Index: /issm/trunk-jpl/test/NightlyRun/test201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test201.m (revision 12791) @@ -0,0 +1,16 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.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/test202.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test202.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test202.m (revision 12791) @@ -1,5 +1,6 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,2); 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/test203.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test203.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test203.m (revision 12791) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,2); +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/test204.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test204.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test204.m (revision 12791) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum); @@ -9,5 +9,5 @@ %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; +field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08}; field_values={... (md.results.DiagnosticSolution.Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test205.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test205.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test205.m (revision 12791) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,2); +md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','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/test206.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test206.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test206.m (revision 12791) @@ -2,17 +2,15 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','all'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,ThermalSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-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/test207.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test207.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test207.m (revision 12791) @@ -0,0 +1,23 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.transient.isdiagnostic=0; +md.transient.isprognostic=0; +md.transient.isthermal=1; +md.transient.isgroundingline=0; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_values={... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test208.m (revision 12791) @@ -1,18 +1,33 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'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-08,1e-08,1e-07,1e-08,1e-08}; +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/test209.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test209.m (revision 12791) @@ -0,0 +1,48 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... + 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8}; +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/test210.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test210.m (revision 12791) @@ -1,18 +1,48 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',200000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','penalties'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure'}; -field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; field_values={... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy),... - (md.results.DiagnosticSolution.Vz),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (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/test211.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test211.m (revision 12791) @@ -0,0 +1,50 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'stokes','all'); +md.diagnostic.reltol=NaN; +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-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,... + 1e-07,1e-07,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.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/test212.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test212.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test212.m (revision 12791) @@ -1,16 +1,33 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',200000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); -md.timestepping.time_step=0; + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'MaterialsRheologyBbar'}; +md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,ThermalSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-13,1e-13}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... - (md.results.ThermalSolution.Temperature),... - (md.results.ThermalSolution.BasalforcingsMeltingRate),... - }; + (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.MaterialsRheologyBbar),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test213.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test213.m (revision 12791) @@ -0,0 +1,34 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'MaterialsRheologyBbar'}; +md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={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.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.MaterialsRheologyB),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test214.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test214.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test214.m (revision 12791) @@ -1,23 +1,34 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model,'../Exp/Square.exp',200000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'pattyn','all'); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'MaterialsRheologyBbar'}; +md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + md.cluster=generic('name',oshostname(),'np',3); -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; + (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.MaterialsRheologyB),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test215.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test215.m (revision 12791) @@ -0,0 +1,34 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'stokes','all'); + +%control parameters +md.inversion.iscontrol=1; +md.inversion.control_parameters={'MaterialsRheologyBbar'}; +md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.nsteps=2; +md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); +md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,DiagnosticSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; +field_values={... + (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.MaterialsRheologyB),... + (md.results.DiagnosticSolution.Pressure),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy) +}; Index: /issm/trunk-jpl/test/NightlyRun/test216.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test216.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test216.m (revision 12791) @@ -1,33 +1,24 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000); +md=meshprocessrifts(md,'../Exp/Square.exp'); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); + +%rift settings +md.rifts.riftstruct.fill=MelangeEnum(); +md.rifts.riftstruct.fraction=0; +md.diagnostic.rift_penalty_lock=2; +md.diagnostic.rift_penalty_threshold=0; +md.rifts.riftstruct.fractionincrement=.1; +md=solve(md,DiagnosticSolutionEnum); %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 ={'Vx','Vy','Vel','Pressure'}; +field_tolerances={1e-11,1e-11,1e-11,1e-11}; 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.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... + (md.results.DiagnosticSolution.Vel),... + (md.results.DiagnosticSolution.Pressure),... }; Index: /issm/trunk-jpl/test/NightlyRun/test217.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test217.m (revision 12791) @@ -0,0 +1,69 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +%redo the parameter file for this special shelf. +%constant thickness, constrained (vy=0) flow into an icefront, +%from 0 m/yr at the grounding line. + +%tighten +md.diagnostic.restol=10^-4; + +%needed later +ymin=min(md.mesh.y); +ymax=max(md.mesh.y); +xmin=min(md.mesh.x); +xmax=max(md.mesh.x); + +di=md.materials.rho_ice/md.materials.rho_water; + +h=1000; +md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); +md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; + +%Initial velocity and pressure +md.initialization.vx=zeros(md.mesh.numberofvertices,1); +md.initialization.vy=zeros(md.mesh.numberofvertices,1); +md.initialization.vz=zeros(md.mesh.numberofvertices,1); +md.initialization.pressure=zeros(md.mesh.numberofvertices,1); + +%Materials +md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); +md.materials.rheology_B=paterson(md.initialization.temperature); +md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); + +%Boundary conditions: +md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); +md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); +md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); + +%constrain flanks to 0 normal velocity +pos=find(md.mesh.x==xmin | md.mesh.x==xmax); +md.diagnostic.spcvx(pos)=0; +md.diagnostic.spcvz(pos)=NaN; + +%constrain grounding line to 0 velocity +pos=find(md.mesh.y==ymin); +md.diagnostic.spcvx(pos)=0; +md.diagnostic.spcvy(pos)=0; + +%icefront +nodeonicefront=zeros(md.mesh.numberofvertices,1); +pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); +diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; +md.diagnostic.icefront=diagnostic.icefront; + +md=solve(md,DiagnosticSolutionEnum); + +%create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292. +%ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3; +%vy_c=ey_c.*md.mesh.y*md.constants.yts; + +%Fields and tolerances to track changes +field_names ={'Vy'}; +field_tolerances={1e-13}; +field_values={(md.results.DiagnosticSolution.Vy)}; Index: /issm/trunk-jpl/test/NightlyRun/test218.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test218.m (revision 12791) @@ -1,48 +1,92 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=squaremesh(model,1000000,1000000,5,5); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); + +%redo the parameter file for this special shelf. +%constant thickness, constrained (vy=0) flow into an icefront, +%from 0 m/yr at the grounding line. + +%needed later +ymin=min(md.mesh.y); +ymax=max(md.mesh.y); +xmin=min(md.mesh.x); +xmax=max(md.mesh.x); + +di=md.materials.rho_ice/md.materials.rho_water; + +h=1000; +md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); +md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; +md.geometry.surface=md.geometry.bed+md.geometry.thickness; + +%Initial velocity and pressure +md.initialization.vx=zeros(md.mesh.numberofvertices,1); +md.initialization.vy=zeros(md.mesh.numberofvertices,1); +md.initialization.vz=zeros(md.mesh.numberofvertices,1); +md.initialization.pressure=zeros(md.mesh.numberofvertices,1); + +%Materials +md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); +md.materials.rheology_B=paterson(md.initialization.temperature); +md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); + +%Boundary conditions: +md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); +md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); +md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); + +%constrain flanks to 0 normal velocity +pos=find(md.mesh.x==xmin | md.mesh.x==xmax); +md.diagnostic.spcvx(pos)=0; +md.diagnostic.spcvz(pos)=NaN; + +%constrain grounding line to 0 velocity +pos=find(md.mesh.y==ymin); +md.diagnostic.spcvx(pos)=0; +md.diagnostic.spcvy(pos)=0; + +%icefront +nodeonicefront=zeros(md.mesh.numberofvertices,1); +pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); +diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; +md.diagnostic.icefront=diagnostic.icefront; + +%partitioning +md.qmu.numberofpartitions=md.mesh.numberofvertices; +md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); +md.qmu.partition=md.qmu.partition-1; + +%Dakota options +%variables +md.qmu.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.05); + +%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^-10; %tighten for qmu analysese +md.qmu.isdakota=1; + +%solve +md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); %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-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... - 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8}; +md=tres(md,'dakota'); +md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')'; +field_names ={'importancefactors'}; +field_tolerances={1e-10}; field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).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),... + md.results.dakota.importancefactors,... }; Index: /issm/trunk-jpl/test/NightlyRun/test219.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test219.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test219.m (revision 12791) @@ -0,0 +1,18 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,2); +md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal'); +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-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/test220.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test220.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test220.m (revision 12791) @@ -1,48 +1,18 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model,'../Exp/Square.exp',120000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); +md=extrude(md,2,1); +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,DiagnosticSolutionEnum); %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... - 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,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.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),... + (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/test221.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test221.m (revision 12791) @@ -0,0 +1,19 @@ +md=triangle(model,'../Exp/Square.exp',120000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,2,1); +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); +md.cluster=generic('name',oshostname(),'np',3); +md.diagnostic.viscosity_overshoot=0; +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: /issm/trunk-jpl/test/NightlyRun/test222.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test222.m (revision 12791) @@ -1,24 +1,16 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); -md.diagnostic.reltol=NaN; +md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); +md.prognostic.hydrostatic_adjustment='Incremental'; 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-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... - 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,... - 1e-07,1e-07,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; +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.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... @@ -26,9 +18,6 @@ (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),... @@ -36,9 +25,6 @@ (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),... @@ -46,5 +32,3 @@ (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/test223.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test223.m (revision 12791) @@ -0,0 +1,35 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; +md.cluster=generic('name',oshostname(),'np',3); +md.prognostic.hydrostatic_adjustment='Incremental'; +md=solve(md,TransientSolutionEnum); + +%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_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),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test224.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test224.m (revision 12791) @@ -2,32 +2,48 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md.prognostic.hydrostatic_adjustment='Incremental'; +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyBbar),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; + (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/test225.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test225.m (revision 12791) @@ -0,0 +1,50 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; +md.cluster=generic('name',oshostname(),'np',3); +md.prognostic.hydrostatic_adjustment='Incremental'; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test226.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test226.m (revision 12791) @@ -1,34 +1,35 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); - -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; - md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; +field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; + (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/test227.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test227.m (revision 12791) @@ -0,0 +1,50 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +field_tolerances={... + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test228.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test228.m (revision 12791) @@ -1,34 +1,64 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model,'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +%Set up transient +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*-1 ]; + +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; + +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; +field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... + 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; +field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... - (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; + (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(1).SurfaceforcingsMassBalance),... + (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(2).SurfaceforcingsMassBalance),... + (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.TransientSolution(3).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Vel),... + (md.results.TransientSolution(4).Pressure),... + (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Surface),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test229.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test229.m (revision 12791) @@ -0,0 +1,64 @@ +md=triangle(model,'../Exp/Square.exp',150000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; + +%Set up transient +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*2 ]; + +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; + +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... + 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; +field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).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).SurfaceforcingsMassBalance),... + (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(2).SurfaceforcingsMassBalance),... + (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.TransientSolution(3).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Vel),... + (md.results.TransientSolution(4).Pressure),... + (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Surface),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test230.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test230.m (revision 12791) @@ -1,34 +1,69 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model,'../Exp/Square.exp',350000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); -%control parameters -md.inversion.iscontrol=1; -md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); -md.inversion.nsteps=2; -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^7*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.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; -md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +%Set up transient +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*-1 ]; + +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; + +md=solve(md,TransientSolutionEnum); %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; -field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; +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,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.Gradient1),... - md.results.DiagnosticSolution.J,... - (md.results.DiagnosticSolution.MaterialsRheologyB),... - (md.results.DiagnosticSolution.Pressure),... - (md.results.DiagnosticSolution.Vel),... - (md.results.DiagnosticSolution.Vx),... - (md.results.DiagnosticSolution.Vy) -}; + (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).SurfaceforcingsMassBalance),... + (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).SurfaceforcingsMassBalance),... + (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).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Vz),... + (md.results.TransientSolution(4).Vel),... + (md.results.TransientSolution(4).Pressure),... + (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Surface),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test231.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test231.m (revision 12791) @@ -0,0 +1,69 @@ +md=triangle(model,'../Exp/Square.exp',350000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; + +%Set up transient +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*2 ]; + +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; + +md=solve(md,TransientSolutionEnum); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; +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,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.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).SurfaceforcingsMassBalance),... + (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).SurfaceforcingsMassBalance),... + (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).SurfaceforcingsMassBalance),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Vz),... + (md.results.TransientSolution(4).Vel),... + (md.results.TransientSolution(4).Pressure),... + (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Surface),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test232.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test232.m (revision 12791) @@ -1,24 +1,28 @@ -md=triangle(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000); -md=meshprocessrifts(md,'../Exp/Square.exp'); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); - -%rift settings -md.rifts.riftstruct.fill=MelangeEnum(); -md.rifts.riftstruct.fraction=0; -md.diagnostic.rift_penalty_lock=2; -md.diagnostic.rift_penalty_threshold=0; -md.rifts.riftstruct.fractionincrement=.1; -md=solve(md,DiagnosticSolutionEnum); +md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5, md.thermal.spctemperature+10, md.thermal.spctemperature+15; 1.5 2.5 3.5 4]; +md.timestepping.time_step=1; +md.timestepping.final_time=4; +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 ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-11,1e-11,1e-11,1e-11}; +field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'}; +field_tolerances={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.Vel),... - (md.results.DiagnosticSolution.Pressure),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + (md.results.TransientSolution(4).Temperature),... + (md.results.TransientSolution(4).BasalforcingsMeltingRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test233.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test233.m (revision 12791) @@ -0,0 +1,62 @@ +md=triangle(model,'../Exp/Square.exp',200000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=extrude(md,3,1); +md=setflowequation(md,'pattyn','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5; 1 2]; +md.timestepping.time_step=0.5; +md.timestepping.final_time=2; +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', ... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; +field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(1).BasalforcingsMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + (md.results.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),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Vz),... + (md.results.TransientSolution(4).Vel),... + (md.results.TransientSolution(4).Pressure),... + (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Surface),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).Temperature),... + (md.results.TransientSolution(4).BasalforcingsMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test234.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.m (revision 12790) +++ /issm/trunk-jpl/test/NightlyRun/test234.m (revision 12791) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model,'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -5,65 +5,68 @@ md.cluster=generic('name',oshostname(),'np',3); -%redo the parameter file for this special shelf. -%constant thickness, constrained (vy=0) flow into an icefront, -%from 0 m/yr at the grounding line. +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; -%tighten -md.diagnostic.restol=10^-4; +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*-1 ]; -%needed later -ymin=min(md.mesh.y); -ymax=max(md.mesh.y); -xmin=min(md.mesh.x); -xmax=max(md.mesh.x); +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; +%Dakota options -di=md.materials.rho_ice/md.materials.rho_water; +%partitioning +md.qmu.numberofpartitions=20; +md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); +md.qmu.partition=md.qmu.partition-1; -h=1000; -md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; +%variables +md.qmu.variables.surface_mass_balance=normal_uncertain('scaled_SurfaceforcingsMassBalance',1,0.1); -%Initial velocity and pressure -md.initialization.vx=zeros(md.mesh.numberofvertices,1); -md.initialization.vy=zeros(md.mesh.numberofvertices,1); -md.initialization.vz=zeros(md.mesh.numberofvertices,1); -md.initialization.pressure=zeros(md.mesh.numberofvertices,1); +%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.IceVolume=response_function('IceVolume',[],[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]); -%Materials -md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); -md.materials.rheology_B=paterson(md.initialization.temperature); -md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); +%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'}; +md.qmu.mass_flux_profile_directory=pwd; -%Boundary conditions: -md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); +%% 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'); -%constrain flanks to 0 normal velocity -pos=find(md.mesh.x==xmin | md.mesh.x==xmax); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvz(pos)=NaN; +%parameters +md.qmu.params.direct=true; +md.qmu.params.analysis_driver=''; +md.qmu.params.analysis_components=''; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; +md.qmu.isdakota=1; -%constrain grounding line to 0 velocity -pos=find(md.mesh.y==ymin); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvy(pos)=0; +md.diagnostic.reltol=10^-5; %tighten for qmu analyses +md.transient.requested_outputs=IceVolumeEnum(); -%icefront -nodeonicefront=zeros(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; -pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); -diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; -md.diagnostic.icefront=diagnostic.icefront; - -md=solve(md,DiagnosticSolutionEnum); - -%create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292. -%ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3; -%vy_c=ey_c.*md.mesh.y*md.constants.yts; +%solve +md=solve(md,TransientSolutionEnum,'overwrite','y'); +md=tres(md,'dakota'); %Fields and tolerances to track changes -field_names ={'Vy'}; -field_tolerances={1e-13}; -field_values={(md.results.DiagnosticSolution.Vy)}; +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.dakota.importancefactors,... + }; Index: /issm/trunk-jpl/test/NightlyRun/test235.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.m (revision 12791) +++ /issm/trunk-jpl/test/NightlyRun/test235.m (revision 12791) @@ -0,0 +1,72 @@ +md=triangle(model,'../Exp/Square.exp',180000); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',3); + +md.timestepping.time_step=1; +md.settings.output_frequency=1; +md.timestepping.final_time=4; + +smb = ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*-1 ]; + +md.surfaceforcings.mass_balance= smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.transient.isthermal=0; +%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.surface_mass_balance=normal_uncertain('scaled_SurfaceforcingsMassBalance',1,100); + +%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.IceVolume=response_function('IceVolume',[],[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]); + +%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'}; +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=''; +md.qmu.params.analysis_components=''; +md.qmu.params.evaluation_concurrency=1; +md.qmu.params.interval_type='forward'; +md.qmu.params.fd_gradient_step_size='0.1'; +md.qmu.isdakota=1; + +md.diagnostic.reltol=10^-5; %tighten for qmu analyses +md.transient.requested_outputs=IceVolumeEnum(); + +%solve +md=solve(md,TransientSolutionEnum,'overwrite','y'); +md=tres(md,'dakota'); + +%Fields and tolerances to track changes +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.dakota.importancefactors,... + }; Index: sm/trunk-jpl/test/NightlyRun/test236.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.m (revision 12790) +++ (revision ) @@ -1,92 +1,0 @@ -md=squaremesh(model,1000000,1000000,5,5); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -%redo the parameter file for this special shelf. -%constant thickness, constrained (vy=0) flow into an icefront, -%from 0 m/yr at the grounding line. - -%needed later -ymin=min(md.mesh.y); -ymax=max(md.mesh.y); -xmin=min(md.mesh.x); -xmax=max(md.mesh.x); - -di=md.materials.rho_ice/md.materials.rho_water; - -h=1000; -md.geometry.thickness=h*ones(md.mesh.numberofvertices,1); -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; - -%Initial velocity and pressure -md.initialization.vx=zeros(md.mesh.numberofvertices,1); -md.initialization.vy=zeros(md.mesh.numberofvertices,1); -md.initialization.vz=zeros(md.mesh.numberofvertices,1); -md.initialization.pressure=zeros(md.mesh.numberofvertices,1); - -%Materials -md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1); -md.materials.rheology_B=paterson(md.initialization.temperature); -md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); - -%Boundary conditions: -md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); -md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - -%constrain flanks to 0 normal velocity -pos=find(md.mesh.x==xmin | md.mesh.x==xmax); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvz(pos)=NaN; - -%constrain grounding line to 0 velocity -pos=find(md.mesh.y==ymin); -md.diagnostic.spcvx(pos)=0; -md.diagnostic.spcvy(pos)=0; - -%icefront -nodeonicefront=zeros(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==ymax); nodeonicefront(pos)=1; -pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2))); diagnostic.icefront=md.mesh.segments(pos,:); -diagnostic.icefront=[diagnostic.icefront 1*md.mask.elementonfloatingice(diagnostic.icefront(:,end))]; -md.diagnostic.icefront=diagnostic.icefront; - -%partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.partition=md.qmu.partition-1; - -%Dakota options -%variables -md.qmu.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.05); - -%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^-10; %tighten for qmu analysese -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_MaterialsRheologyB','MaxVel')'; -field_names ={'importancefactors'}; -field_tolerances={1e-10}; -field_values={... - md.results.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test238.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test238.m (revision 12790) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,2); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal'); -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-13}; -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/test240.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test240.m (revision 12790) +++ (revision ) @@ -1,18 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',120000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,2,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-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/test242.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test242.m (revision 12790) +++ (revision ) @@ -1,19 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',120000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,2,1); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); -md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.viscosity_overshoot=0; -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/test244.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test244.m (revision 12790) +++ (revision ) @@ -1,34 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%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_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),... - }; Index: sm/trunk-jpl/test/NightlyRun/test246.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test246.m (revision 12790) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; -md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%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_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),... - }; Index: sm/trunk-jpl/test/NightlyRun/test248.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test248.m (revision 12790) +++ (revision ) @@ -1,49 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... - 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test250.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test250.m (revision 12790) +++ (revision ) @@ -1,50 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; -md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.hydrostatic_adjustment='Incremental'; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... - 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test252.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test252.m (revision 12790) +++ (revision ) @@ -1,35 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; -md=solve(md,TransientSolutionEnum); - -%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_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),... - }; Index: sm/trunk-jpl/test/NightlyRun/test254.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test254.m (revision 12790) +++ (revision ) @@ -1,50 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; -field_tolerances={... - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... - 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Vz),... - (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test256.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test256.m (revision 12790) +++ (revision ) @@ -1,64 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; -field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).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).SurfaceforcingsMassBalance),... - (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(2).SurfaceforcingsMassBalance),... - (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.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test258.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test258.m (revision 12790) +++ (revision ) @@ -1,64 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',150000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'}; -field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; - -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).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).SurfaceforcingsMassBalance),... - (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(2).SurfaceforcingsMassBalance),... - (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.TransientSolution(3).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test260.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test260.m (revision 12790) +++ (revision ) @@ -1,69 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; -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,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.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).SurfaceforcingsMassBalance),... - (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).SurfaceforcingsMassBalance),... - (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).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test262.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test262.m (revision 12790) +++ (revision ) @@ -1,69 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',350000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -%Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; - -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; -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,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.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).SurfaceforcingsMassBalance),... - (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).SurfaceforcingsMassBalance),... - (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).SurfaceforcingsMassBalance),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... - }; Index: sm/trunk-jpl/test/NightlyRun/test264.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test264.m (revision 12790) +++ (revision ) @@ -1,28 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5, md.thermal.spctemperature+10, md.thermal.spctemperature+15; 1.5 2.5 3.5 4]; -md.timestepping.time_step=1; -md.timestepping.final_time=4; -md.transient.isdiagnostic=0; -md.transient.isprognostic=0; -md.transient.isthermal=1; -md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); - -%Fields and tolerances to track changes -field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; -field_values={... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.TransientSolution(3).Temperature),... - (md.results.TransientSolution(3).BasalforcingsMeltingRate),... - (md.results.TransientSolution(4).Temperature),... - (md.results.TransientSolution(4).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test266.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test266.m (revision 12790) +++ (revision ) @@ -1,62 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',200000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=extrude(md,3,1); -md=setflowequation(md,'pattyn','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5; 1 2]; -md.timestepping.time_step=0.5; -md.timestepping.final_time=2; -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', ... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; -field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; -field_values={... - (md.results.TransientSolution(1).Vx),... - (md.results.TransientSolution(1).Vy),... - (md.results.TransientSolution(1).Vz),... - (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... - (md.results.TransientSolution(1).Surface),... - (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).Temperature),... - (md.results.TransientSolution(1).BasalforcingsMeltingRate),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Vz),... - (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... - (md.results.TransientSolution(2).Surface),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Temperature),... - (md.results.TransientSolution(2).BasalforcingsMeltingRate),... - (md.results.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),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Vz),... - (md.results.TransientSolution(4).Vel),... - (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... - (md.results.TransientSolution(4).Surface),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).Temperature),... - (md.results.TransientSolution(4).BasalforcingsMeltingRate),... - }; Index: sm/trunk-jpl/test/NightlyRun/test268.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test268.m (revision 12790) +++ (revision ) @@ -1,72 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; -%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.surface_mass_balance=normal_uncertain('scaled_SurfaceforcingsMassBalance',1,0.1); - -%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.IceVolume=response_function('IceVolume',[],[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]); - -%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'}; -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'); - -%parameters -md.qmu.params.direct=true; -md.qmu.params.analysis_driver=''; -md.qmu.params.analysis_components=''; -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 -md.transient.requested_outputs=IceVolumeEnum(); - -%solve -md=solve(md,TransientSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%Fields and tolerances to track changes -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.dakota.importancefactors,... - }; Index: sm/trunk-jpl/test/NightlyRun/test270.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test270.m (revision 12790) +++ (revision ) @@ -1,72 +1,0 @@ -md=triangle(model,'../Exp/Square.exp',180000); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',3); - -md.timestepping.time_step=1; -md.settings.output_frequency=1; -md.timestepping.final_time=4; - -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; - -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; -md.transient.isthermal=0; -%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.surface_mass_balance=normal_uncertain('scaled_SurfaceforcingsMassBalance',1,100); - -%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.IceVolume=response_function('IceVolume',[],[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]); - -%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'}; -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=''; -md.qmu.params.analysis_components=''; -md.qmu.params.evaluation_concurrency=1; -md.qmu.params.interval_type='forward'; -md.qmu.params.fd_gradient_step_size='0.1'; -md.qmu.isdakota=1; - -md.diagnostic.reltol=10^-5; %tighten for qmu analyses -md.transient.requested_outputs=IceVolumeEnum(); - -%solve -md=solve(md,TransientSolutionEnum,'overwrite','y'); -md=tres(md,'dakota'); - -%Fields and tolerances to track changes -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.dakota.importancefactors,... - };