Index: /issm/trunk-jpl/test/NightlyRun/test255.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test255.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test255.m (revision 26439) @@ -0,0 +1,35 @@ +%Test Name: SquareShelfStressMLHO2dTransientIncrHydro +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.masstransport.hydrostatic_adjustment='Incremental'; +md=solve(md,'Transient'); + +%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).Base),... + (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).Base),... + (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).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test255.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test255.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test255.py (revision 26439) @@ -0,0 +1,52 @@ +#Test Name: SquareShelfStressMLHO2dTransientIncrHydro +from model import * +from socket import gethostname +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') + +#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[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + 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].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test256.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test256.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test256.m (revision 26439) @@ -0,0 +1,36 @@ +%Test Name: SquareShelfStressMLHO2dTransientIncrNonHydro +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelf.par'); +md=setflowequation(md,'MLHO','all'); +md.geometry.base=md.geometry.base+50.; md.geometry.surface=md.geometry.surface+50.; +md.cluster=generic('name',oshostname(),'np',1); +md.masstransport.hydrostatic_adjustment='Incremental'; +md=solve(md,'Transient'); + +%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).Base),... + (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).Base),... + (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).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test256.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test256.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test256.py (revision 26439) @@ -0,0 +1,54 @@ +#Test Name: SquareShelfStressMLHO2dTransientIncrNonHydro +from model import * +from socket import gethostname +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'MLHO', 'all') +md.geometry.base = md.geometry.base + 50. +md.geometry.surface = md.geometry.surface + 50. +md.cluster = generic('name', gethostname(), 'np', 1) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') + +#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[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + 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].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test330.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test330.m (revision 26439) @@ -0,0 +1,24 @@ +%Test Name: SquareSheetConstrainedStressMLHO2d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.stressbalance.requested_outputs={'default','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase'}; +md=solve(md,'Stressbalance'); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vel','Pressure','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase'}; +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.StressbalanceSolution.Vx),... + (md.results.StressbalanceSolution.Vy),... + (md.results.StressbalanceSolution.Vel),... + (md.results.StressbalanceSolution.Pressure),... + (md.results.StressbalanceSolution.VxSurface),... + (md.results.StressbalanceSolution.VySurface),... + (md.results.StressbalanceSolution.VxShear),... + (md.results.StressbalanceSolution.VyShear),... + (md.results.StressbalanceSolution.VxBase),... + (md.results.StressbalanceSolution.VyBase),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test330.py (revision 26439) @@ -0,0 +1,31 @@ +#Test Name: SquareSheetConstrainedStressMLHO2d +from model import * +from socket import gethostname +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] +md = solve(md, 'Stressbalance') + +#Fields and tolerances to track changes +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] +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.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.VxSurface, + md.results.StressbalanceSolution.VySurface, + md.results.StressbalanceSolution.VxShear, + md.results.StressbalanceSolution.VyShear, + md.results.StressbalanceSolution.VxBase, + md.results.StressbalanceSolution.VyBase] Index: /issm/trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test332.m (revision 26439) @@ -0,0 +1,39 @@ +%Test Name: SquareSheetConstrainedTranMLHO2d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,'Transient'); + +%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,... + 2e-13,1e-13,1e-13,2e-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).Base),... + (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).Base),... + (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).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test332.py (revision 26439) @@ -0,0 +1,43 @@ +#Test Name: SquareSheetConstrainedTranMLHO2d +from model import * +from socket import gethostname +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') + +#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, + 2e-13, 1e-13, 1e-13, 2e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + 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].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test446.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test446.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test446.m (revision 26439) @@ -0,0 +1,25 @@ +%Test Name: SquareSheetShelfStressMLHO2d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.stressbalance.requested_outputs={'default','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase'}; +md=solve(md,'Stressbalance'); + +%Fields and tolerances to track changes +field_names ={'Vx','Vy','Vel','Pressure','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase'}; +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.StressbalanceSolution.Vx),... + (md.results.StressbalanceSolution.Vy),... + (md.results.StressbalanceSolution.Vel),... + (md.results.StressbalanceSolution.Pressure),... + (md.results.StressbalanceSolution.VxSurface),... + (md.results.StressbalanceSolution.VySurface),... + (md.results.StressbalanceSolution.VxShear),... + (md.results.StressbalanceSolution.VyShear),... + (md.results.StressbalanceSolution.VxBase),... + (md.results.StressbalanceSolution.VyBase),... + }; + Index: /issm/trunk-jpl/test/NightlyRun/test446.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test446.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test446.py (revision 26439) @@ -0,0 +1,31 @@ +#Test Name: SquareSheetShelfStressMLHO2d +from model import * +from socket import gethostname + +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] +md = solve(md, 'Stressbalance') + +#Fields and tolerances to track changes +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] +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.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.VxSurface, + md.results.StressbalanceSolution.VySurface, + md.results.StressbalanceSolution.VxShear, + md.results.StressbalanceSolution.VyShear, + md.results.StressbalanceSolution.VxBase, + md.results.StressbalanceSolution.VyBase] Index: /issm/trunk-jpl/test/NightlyRun/test447.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test447.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test447.m (revision 26439) @@ -0,0 +1,68 @@ +%Test Name: SquareSheetShelfTranMLHO2d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.geometry.bed=md.geometry.base; +pos=find(md.mask.ocean_levelset<0); +md.geometry.bed(pos)=md.geometry.base(pos)-10; +md.friction=frictioncoulomb(); +md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1); +md.friction.p=ones(md.mesh.numberofelements,1); +md.friction.q=ones(md.mesh.numberofelements,1); +md.friction.coefficientcoulomb=0.02*ones(md.mesh.numberofvertices,1); +md.transient.isthermal=0; +md.transient.isgroundingline=1; +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); +md.transient.requested_outputs={'default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb','TotalSmb'}; +md=solve(md,'Transient'); + +%Fields and tolerances to track changes +field_names={... + 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',... + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','FloatingArea2','TotalFloatingBmb2','TotalGroundedBmb2','TotalSmb2',... + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3'... +}; +field_tolerances={... + 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 2e-13,2e-13,2e-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).Base),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).GroundedArea),... + (md.results.TransientSolution(1).FloatingArea),... + (md.results.TransientSolution(1).TotalFloatingBmb),... + (md.results.TransientSolution(1).TotalGroundedBmb),... + (md.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Base),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).GroundedArea),... + (md.results.TransientSolution(2).FloatingArea),... + (md.results.TransientSolution(2).TotalFloatingBmb),... + (md.results.TransientSolution(2).TotalGroundedBmb),... + (md.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).GroundedArea),... + (md.results.TransientSolution(3).FloatingArea),... + (md.results.TransientSolution(3).TotalFloatingBmb),... + (md.results.TransientSolution(3).TotalGroundedBmb),... + (md.results.TransientSolution(3).TotalSmb),... +}; Index: /issm/trunk-jpl/test/NightlyRun/test447.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test447.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test447.py (revision 26439) @@ -0,0 +1,79 @@ +#Test Name: SquareSheetShelfTranMLHO2d +import numpy as np +from model import * +from socket import gethostname + +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * +from frictioncoulomb import frictioncoulomb + +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.geometry.bed = copy.deepcopy(md.geometry.base) +pos = np.nonzero(md.mask.ocean_levelset < 0.) +md.geometry.bed[pos] = md.geometry.bed[pos] - 10 +md.friction = frictioncoulomb() +md.friction.coefficient = 20 * np.ones(md.mesh.numberofvertices) +md.friction.p = 1 * np.ones(md.mesh.numberofelements) +md.friction.q = 1 * np.ones(md.mesh.numberofelements) +md.friction.coefficientcoulomb = 0.02 * np.ones(md.mesh.numberofvertices) +md.transient.isthermal = False +md.transient.isgroundingline = True +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'TotalFloatingBmb', 'TotalGroundedBmb', 'TotalSmb'] +md = solve(md, 'Transient') + +#Fields and tolerances to track changes +field_names = [ + 'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb3', 'TotalGroundedBmb3', 'TotalSmb3' +] +field_tolerances = [ + 2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, +] +field_values = [ + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].TotalFloatingBmb, + md.results.TransientSolution[2].TotalGroundedBmb, + md.results.TransientSolution[2].TotalSmb +] Index: /issm/trunk-jpl/test/NightlyRun/test448.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test448.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test448.m (revision 26439) @@ -0,0 +1,53 @@ +%Test Name: RoundSheetShelfGLMigrationMLHO2d +radius=1.e6; +shelfextent=2.e5; + +md=roundmesh(model(),radius,50000.); +%fix center node to 0,0 +rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); +pos=find(rad==min(rad)); +md.mesh.x(pos)=0.; md.mesh.y(pos)=0.; %the closest node to the center is changed to be exactly at the center +xelem=mean(md.mesh.x(md.mesh.elements),2); +yelem=mean(md.mesh.y(md.mesh.elements),2); +rad=sqrt(xelem.^2+yelem.^2); +flags=zeros(md.mesh.numberofelements,1); +pos=find(rad>=(radius-shelfextent)); +flags(pos)=1; +md=setmask(md,flags,''); +md=parameterize(md,'../Par/RoundSheetShelf.par'); +md=setflowequation(md,'MLHO','all'); +md.cluster=generic('name',oshostname(),'np',3); + +md.transient.isthermal=0; +md.transient.ismasstransport=0; +md.transient.issmb=1; +md.transient.isstressbalance=1; +md.transient.isgroundingline=1; + +%test different grounding line dynamics. +md.groundingline.migration='AggressiveMigration'; +md=solve(md,'Transient'); +element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset); +vel_agressive=(md.results.TransientSolution.Vel); + +md.groundingline.migration='SoftMigration'; +md=solve(md,'Transient'); +element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset); +vel_soft=(md.results.TransientSolution.Vel); + +md.mask.ocean_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +md.groundingline.migration='SubelementMigration'; +md.groundingline.friction_interpolation='SubelementFriction1'; +md=solve(md,'Transient'); +element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset); +vel_subelement=(md.results.TransientSolution.Vel); + +md.groundingline.friction_interpolation='SubelementFriction2'; +md=solve(md,'Transient'); +element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset); +vel_subelement2=(md.results.TransientSolution.Vel); + +%Fields and tolerances to track changes +field_names ={'ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'}; +field_tolerances={1e-13,2e-12,1e-13,2e-12,1e-13,3e-12,1e-13,2e-12}; +field_values={element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2}; Index: /issm/trunk-jpl/test/NightlyRun/test448.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test448.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test448.py (revision 26439) @@ -0,0 +1,64 @@ +#Test Name: RoundSheetShelfGLMigrationMLHO2d +import numpy as np +from model import * +from socket import gethostname +from roundmesh import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + + +radius = 1.e6 +shelfextent = 2.e5 + +md = roundmesh(model(), radius, 50000.) +#fix center node to 0, 0 +rad = np.sqrt(md.mesh.x**2 + md.mesh.y**2) +pos = np.argmin(rad) +md.mesh.x[pos] = 0. +md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center +xelem = np.mean(md.mesh.x[md.mesh.elements - 1], axis=1) +yelem = np.mean(md.mesh.y[md.mesh.elements - 1], axis=1) +rad = np.sqrt(xelem**2 + yelem**2) +flags = np.zeros(md.mesh.numberofelements) +pos = np.nonzero(rad >= (radius - shelfextent)) +flags[pos] = 1 +md = setmask(md, flags, '') +md = parameterize(md, '../Par/RoundSheetShelf.py') +md = setflowequation(md, 'MLHO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) + +md.transient.isthermal = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isstressbalance = True +md.transient.isgroundingline = True + +#test different grounding line dynamics. +md.groundingline.migration = 'AggressiveMigration' +md = solve(md, 'Transient') +element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset +vel_agressive = md.results.TransientSolution[0].Vel + +md.groundingline.migration = 'SoftMigration' +md = solve(md, 'Transient') +element_on_iceshelf_soft = md.results.TransientSolution[0].MaskOceanLevelset +vel_soft = md.results.TransientSolution[0].Vel + +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +md.groundingline.migration = 'SubelementMigration' +md.groundingline.friction_interpolation = 'SubelementFriction1' +md = solve(md, 'Transient') +element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskOceanLevelset +vel_subelement = md.results.TransientSolution[0].Vel + +md.groundingline.friction_interpolation = 'SubelementFriction2' +md = solve(md, 'Transient') +element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskOceanLevelset +vel_subelement2 = md.results.TransientSolution[0].Vel + +#Fields and tolerances to track changes +field_names = ['ElementOnIceShelfAggressive', 'VelAggressive', 'ElementOnIceShelfSoft', 'VelSoft', 'ElementOnIceShelfSubelement', 'VelSubelement', 'ElementOnIceShelfSubelement2', 'VelSubelement2'] +field_tolerances = [1e-13, 2e-13, 1e-13, 2e-13, 1e-13, 2e-13, 1e-13, 2e-13] +field_values = [element_on_iceshelf_agressive, vel_agressive, element_on_iceshelf_soft, vel_soft, element_on_iceshelf_subelement, vel_subelement, element_on_iceshelf_subelement2, vel_subelement2] Index: /issm/trunk-jpl/test/NightlyRun/test449.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test449.m (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test449.m (revision 26439) @@ -0,0 +1,81 @@ +%Test Name: MISMIP3DMLHO +md=triangle(model(),'../Exp/Square.exp',100000.); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.initialization.vx(:)=1.; +md.initialization.vy(:)=1.; +md.geometry.thickness(:)=500-md.mesh.x/10000; +md.geometry.bed =-100-md.mesh.x/1000; +md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); +md.geometry.base(pos)=md.geometry.bed(pos); +md.geometry.surface=md.geometry.base+md.geometry.thickness; +md=setflowequation(md,'MLHO','all'); + +%Boundary conditions: +md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ice_levelset(find(md.mesh.x==max(md.mesh.x)))=0; +md.stressbalance.spcvx(:)=NaN; +md.stressbalance.spcvy(:)=NaN; +md.stressbalance.spcvz(:)=NaN; +pos=find((md.mesh.y<1000000.1 & md.mesh.y>999999.9) | (md.mesh.y<0.1 & md.mesh.y>-0.1)); +md.stressbalance.spcvy(pos)=0; +pos2=find(md.mesh.x<0.1 & md.mesh.x>-0.1); +md.stressbalance.spcvx(pos2)=0; +md.stressbalance.spcvy(pos2)=0; + +md.materials.rheology_B=1/((10^-25)^(1/3))*ones(md.mesh.numberofvertices,1); +md.materials.rheology_law='None'; +md.friction.coefficient(:)=sqrt(10^7)*ones(md.mesh.numberofvertices,1); +md.friction.p=3*ones(md.mesh.numberofelements,1); +md.smb.mass_balance(:)=1; +md.basalforcings.groundedice_melting_rate(:)=0; +md.basalforcings.floatingice_melting_rate(:)=30; +md.transient.isthermal=0; +md.transient.isstressbalance=1; +md.transient.isgroundingline=1; +md.transient.ismasstransport=1; +md.transient.issmb=1; +md.transient.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'}; +md.groundingline.migration='SubelementMigration'; +md.groundingline.melt_interpolation='SubelementMelt1'; +md.timestepping.final_time=30; +md.timestepping.time_step=10; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,'Transient'); + +%Fields and tolerances to track changes +field_names ={'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Pressure1','FloatingiceMeltingrate1',... + 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2',... + 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'}; +field_tolerances={2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,1e-13,1e-13,... + 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-10,1e-13,... + 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-10,1e-13}; +field_values={... + (md.results.TransientSolution(1).Base),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskOceanLevelset),... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(2).Base),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskOceanLevelset),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(3).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskOceanLevelset),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test449.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test449.py (revision 26439) +++ /issm/trunk-jpl/test/NightlyRun/test449.py (revision 26439) @@ -0,0 +1,93 @@ +#Test Name: MISMIP3DMLHO +import numpy as np +from model import * +from socket import gethostname +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.initialization.vx[:] = 1. +md.initialization.vy[:] = 1. +md.geometry.thickness[:] = 500. - md.mesh.x / 10000. +md.geometry.bed = -100. - md.mesh.x / 1000. +md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +pos = np.where(md.mask.ocean_levelset >= 0.) +md.geometry.base[pos] = md.geometry.bed[pos] +md.geometry.surface = md.geometry.base + md.geometry.thickness +md = setflowequation(md, 'MLHO', 'all') + +#Boundary conditions: +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset[np.where(md.mesh.x == max(md.mesh.x))] = 0. +md.stressbalance.spcvx[:] = float('NaN') +md.stressbalance.spcvy[:] = float('NaN') +md.stressbalance.spcvz[:] = float('NaN') +posA = np.intersect1d(np.array(np.where(md.mesh.y < 1000000.1)), np.array(np.where(md.mesh.y > 999999.9))) +posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > -0.1))) +pos = np.unique(np.concatenate((posA, posB))) +md.stressbalance.spcvy[pos] = 0. +pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > -0.1))) +md.stressbalance.spcvx[pos2] = 0. +md.stressbalance.spcvy[pos2] = 0. + +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_law = 'None' +md.friction.coefficient[:] = np.sqrt(10**7) * np.ones((md.mesh.numberofvertices, )) +md.friction.p = 3. * np.ones((md.mesh.numberofelements, )) +md.smb.mass_balance[:] = 1. +md.basalforcings.groundedice_melting_rate[:] = 0. +md.basalforcings.floatingice_melting_rate[:] = 30. +md.transient.isthermal = 0 +md.transient.isstressbalance = 1 +md.transient.isgroundingline = 1 +md.transient.ismasstransport = 1 +md.transient.issmb = 1 +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] +md.groundingline.migration = 'SubelementMigration' +md.groundingline.melt_interpolation = 'SubelementMelt1' +md.timestepping.final_time = 30 +md.timestepping.time_step = 10 + +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') +#print md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate +#print md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate +#print md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate + +#Fields and tolerances to track changes +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'Vx1', 'Vy1', 'Pressure1', 'FloatingiceMeltingrate1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'Vx2', 'Vy2', 'Pressure2', 'FloatingiceMeltingrate2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'Vx3', 'Vy3', 'Pressure3', 'FloatingiceMeltingrate3'] +field_tolerances = [2e-11, 5e-12, 2e-11, 1e-11, 5e-10, 1e-08, 1e-13, 1e-13, + 3e-11, 3e-11, 9e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13, + 1e-10, 3e-11, 1e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskOceanLevelset, + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskOceanLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskOceanLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate]