Index: /issm/trunk-jpl/test/NightlyRun/test221.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test221.py (revision 13580) @@ -0,0 +1,28 @@ +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',120000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(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'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ + md.results['DiagnosticSolution'][1]['Vz'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test222.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test222.py (revision 13580) @@ -0,0 +1,43 @@ +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/SquareShelf.py') +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: /issm/trunk-jpl/test/NightlyRun/test223.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.m (revision 13579) +++ /issm/trunk-jpl/test/NightlyRun/test223.m (revision 13580) @@ -3,5 +3,5 @@ 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.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.; md.cluster=generic('name',oshostname(),'np',1); md.prognostic.hydrostatic_adjustment='Incremental'; Index: /issm/trunk-jpl/test/NightlyRun/test223.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test223.py (revision 13580) @@ -0,0 +1,45 @@ +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/SquareShelf.py') +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',1) +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 13579) +++ /issm/trunk-jpl/test/NightlyRun/test224.m (revision 13580) @@ -10,6 +10,6 @@ %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'}; + '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,... Index: /issm/trunk-jpl/test/NightlyRun/test224.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test224.py (revision 13580) @@ -0,0 +1,58 @@ +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/SquareShelf.py') +md.extrude(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: /issm/trunk-jpl/test/NightlyRun/test225.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.m (revision 13579) +++ /issm/trunk-jpl/test/NightlyRun/test225.m (revision 13580) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50; +md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.; md=extrude(md,3,1); md=setflowequation(md,'pattyn','all'); @@ -11,6 +11,6 @@ %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'}; + '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,... Index: /issm/trunk-jpl/test/NightlyRun/test225.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test225.py (revision 13580) @@ -0,0 +1,60 @@ +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/SquareShelf.py') +md.geometry.bed=md.geometry.bed+50. +md.geometry.surface=md.geometry.surface+50. +md.extrude(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-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 13579) +++ /issm/trunk-jpl/test/NightlyRun/test226.m (revision 13580) @@ -4,6 +4,6 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; +md.timestepping.time_adapt=1.; +md.timestepping.final_time=10.; md=solve(md,TransientSolutionEnum); Index: /issm/trunk-jpl/test/NightlyRun/test226.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test226.py (revision 13580) @@ -0,0 +1,44 @@ +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/SquareShelf.py') +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: /issm/trunk-jpl/test/NightlyRun/test227.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.m (revision 13579) +++ /issm/trunk-jpl/test/NightlyRun/test227.m (revision 13580) @@ -5,12 +5,12 @@ md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_adapt=1; -md.timestepping.final_time=10; +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'}; + '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,... Index: /issm/trunk-jpl/test/NightlyRun/test227.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test227.py (revision 13580) @@ -0,0 +1,59 @@ +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/SquareShelf.py') +md.extrude(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 13579) +++ /issm/trunk-jpl/test/NightlyRun/test228.m (revision 13580) @@ -5,14 +5,14 @@ md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=1; +md.timestepping.time_step=1.; md.settings.output_frequency=1; -md.timestepping.final_time=4; +md.timestepping.final_time=4.; %Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; +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.surfaceforcings.mass_balance=smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.]; md.transient.isthermal=0; @@ -28,5 +28,4 @@ 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),... Index: /issm/trunk-jpl/test/NightlyRun/test228.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test228.py (revision 13580) @@ -0,0 +1,72 @@ +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/SquareShelf.py') +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=numpy.ones((md.mesh.numberofvertices,1))*3.6 +smb=numpy.hstack((smb,smb*-1.)) + +md.surfaceforcings.mass_balance=numpy.vstack((smb,[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/test229.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.m (revision 13579) +++ /issm/trunk-jpl/test/NightlyRun/test229.m (revision 13580) @@ -5,14 +5,14 @@ md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=1; +md.timestepping.time_step=1.; md.settings.output_frequency=1; -md.timestepping.final_time=4; +md.timestepping.final_time=4.; %Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; +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.surfaceforcings.mass_balance=smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.]; md.transient.isthermal=0; @@ -28,5 +28,4 @@ 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),... Index: /issm/trunk-jpl/test/NightlyRun/test229.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.py (revision 13580) +++ /issm/trunk-jpl/test/NightlyRun/test229.py (revision 13580) @@ -0,0 +1,72 @@ +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/SquareShelf.py') +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=numpy.ones((md.mesh.numberofvertices,1))*3.6 +smb=numpy.hstack((smb,smb*2.)) + +md.surfaceforcings.mass_balance=numpy.vstack((smb,[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'],\ + ]