Index: /issm/trunk-jpl/test/NightlyRun/test111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test111.py (revision 13280) @@ -0,0 +1,62 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',200000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.extrude(3,1) +md=setflowequation(md,'pattyn','all') +md.cluster=generic('name',oshostname(),'np',3) +md.transient.requested_outputs=IceVolumeEnum() +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names=[\ + 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsMeltingRate1','Volume1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2','Volume2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3','Volume3'] +field_tolerances=[\ + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,\ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,2e-12,\ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-11] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][1]['IceVolume'],\ + 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'][2]['IceVolume'],\ + 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'][3]['IceVolume'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test112.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test112.py (revision 13280) @@ -0,0 +1,23 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,SurfaceSlopeSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['SurfaceSlopeX','SurfaceSlopeY'] +field_tolerances=[1e-13,1e-13] +field_values=[\ + md.results['SurfaceSlopeSolution'][1]['SurfaceSlopeX'],\ + md.results['SurfaceSlopeSolution'][1]['SurfaceSlopeY'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test113.py (revision 13280) @@ -0,0 +1,24 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.extrude(5,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,SurfaceSlopeSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['SurfaceSlopeX','SurfaceSlopeY'] +field_tolerances=[1e-13,1e-13] +field_values=[\ + md.results['SurfaceSlopeSolution'][1]['SurfaceSlopeX'],\ + md.results['SurfaceSlopeSolution'][1]['SurfaceSlopeY'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test114.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test114.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test114.py (revision 13280) @@ -0,0 +1,23 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,BedSlopeSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['BedSlopeX','BedSlopeY'] +field_tolerances=[1e-13,1e-13] +field_values=[\ + md.results['BedSlopeSolution'][1]['BedSlopeX'],\ + md.results['BedSlopeSolution'][1]['BedSlopeY'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test115.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test115.py (revision 13280) @@ -0,0 +1,24 @@ +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.extrude(5,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,BedSlopeSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['BedSlopeX','BedSlopeY'] +field_tolerances=[1e-13,1e-13] +field_values=[\ + md.results['BedSlopeSolution'][1]['BedSlopeX'],\ + md.results['BedSlopeSolution'][1]['BedSlopeY'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test116.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test116.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test116.py (revision 13280) @@ -0,0 +1,26 @@ +import numpy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +#Add boundary conditions on thickness on the border +pos=numpy.nonzero(md.mesh.vertexonboundary) +md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,BalancethicknessSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Thickness'] +field_tolerances=[1e-13] +field_values=[\ + md.results['BalancethicknessSolution'][1]['Thickness'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test117.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test117.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test117.py (revision 13280) @@ -0,0 +1,27 @@ +import numpy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.extrude(5,1) +#Add boundary conditions on thickness on the border +pos=numpy.nonzero(md.mesh.vertexonboundary) +md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,BalancethicknessSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Thickness'] +field_tolerances=[1e-13] +field_values=[\ + md.results['BalancethicknessSolution'][1]['Thickness'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test118.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test118.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test118.py (revision 13280) @@ -0,0 +1,26 @@ +from model import * +from triangle import * +from meshconvert import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=meshconvert(md) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.balancethickness.stabilization=3 +md.initialization.vy=md.initialization.vy+400. +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,BalancethicknessSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Thickness'] +field_tolerances=[1e-13] +field_values=[\ + md.results['BalancethicknessSolution'][1]['Thickness'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test120.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test120.py (revision 13280) +++ /issm/trunk-jpl/test/NightlyRun/test120.py (revision 13280) @@ -0,0 +1,28 @@ +import numpy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.timestepping.time_step=0 +md.cluster=generic('name',oshostname(),'np',3) +md.initialization.waterfraction=numpy.zeros(md.mesh.numberofvertices) +md=solve(md,EnthalpySolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Enthalpy','Waterfraction','Temperature'] +field_tolerances=[1e-13,1e-10,1e-13] +field_values=[\ + md.results['EnthalpySolution'][1]['Enthalpy'],\ + md.results['EnthalpySolution'][1]['Waterfraction'],\ + md.results['EnthalpySolution'][1]['Temperature'],\ + ]