Index: /issm/trunk-jpl/test/NightlyRun/test421.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test421.py (revision 13681) @@ -0,0 +1,28 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000.) +md=setmask(md,'../Exp/SquareShelf.exp','') +md=parameterize(md,'../Par/SquareSheetShelf.py') +md.extrude(5,1.) +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-08,2e-09,2e-05,1e-09,2e-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/test422.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test422.py (revision 13681) @@ -0,0 +1,29 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000.) +md=setmask(md,'../Exp/SquareShelf.exp','') +md=parameterize(md,'../Par/SquareSheetShelf.py') +md.extrude(5,1.) +md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal') +md.cluster=generic('name',oshostname(),'np',3) +md.diagnostic.reltol=0.4 +md=solve(md,DiagnosticSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-09,1e-09,1e-06,1e-09,1e-09] +field_values=[\ + md.results['DiagnosticSolution'][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/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 13681) @@ -2,5 +2,5 @@ shelfextent=2e5; -md=roundmesh(model(),radius,50000); +md=roundmesh(model(),radius,50000.); %fix center node to 0,0 rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 13681) @@ -3,12 +3,11 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setflowequation(md,'macayeal','all'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; +md.initialization.vx(:)=0.; +md.initialization.vy(:)=0.; +md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.thickness(:)=1000.; md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; +md.surfaceforcings.mass_balance(:)=100.; md.transient.isdiagnostic=0; md.transient.isgroundingline=1; Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 13681) @@ -0,0 +1,49 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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,'macayeal','all') +md.initialization.vx[:]=0. +md.initialization.vy[:]=0. +md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.thickness[:]=1000. +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md.surfaceforcings.mass_balance[:]=100. +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='AgressiveMigration' + +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test424.py1 =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py1 (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test424.py1 (revision 13681) @@ -0,0 +1,50 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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,'macayeal','all') +md.initialization.vx(:)=0 +md.initialization.vy(:)=0 +md.initialization.vel(:)=0 +md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000. +md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000. +md.geometry.thickness(:)=1000. +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md.surfaceforcings.mass_balance(:)=100. +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='AgressiveMigration' + +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 13681) @@ -3,12 +3,11 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setflowequation(md,'macayeal','all'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1300; +md.initialization.vx(:)=0.; +md.initialization.vy(:)=0.; +md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.thickness(:)=1300.; md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=-150; +md.surfaceforcings.mass_balance(:)=-150.; md.transient.isdiagnostic=0; md.transient.isgroundingline=1; Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 13681) @@ -0,0 +1,49 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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,'macayeal','all') +md.initialization.vx[:]=0. +md.initialization.vy[:]=0. +md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.thickness[:]=1300. +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md.surfaceforcings.mass_balance[:]=-150. +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='SoftMigration' + +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 13681) @@ -2,15 +2,13 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; -md.geometry.thickness(:)=1000; +md.initialization.vx(:)=0.; +md.initialization.vy(:)=0.; +md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.thickness(:)=1000.; md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md.surfaceforcings.mass_balance(:)=100; +md.surfaceforcings.mass_balance(:)=100.; md=extrude(md,3,1.); md=setflowequation(md,'macayeal','all'); - md.transient.isdiagnostic=0; md.transient.isgroundingline=1; Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 13681) @@ -0,0 +1,50 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',350000.) +md=setmask(md,'../Exp/SquareShelf.exp','') +md=parameterize(md,'../Par/SquareSheetShelf.py') +md.initialization.vx[:]=0. +md.initialization.vy[:]=0. +md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.thickness[:]=1000. +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md.surfaceforcings.mass_balance[:]=100. +md.extrude(3,1.); +md=setflowequation(md,'macayeal','all'); +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='AgressiveMigration' +md.cluster=generic('name',oshostname(),'np',3) + +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-11,1e-11,1e-11,1e-13,\ + 1e-10,1e-10,1e-10,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 13681) @@ -2,9 +2,8 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md.initialization.vx(:)=0; -md.initialization.vy(:)=0; -md.initialization.vel(:)=0; -md.geometry.bed=-700-abs(md.mesh.y-500000)/1000; -md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000; +md.initialization.vx(:)=0.; +md.initialization.vy(:)=0.; +md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.; +md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.; md.geometry.thickness(:)=1300; md.geometry.surface=md.geometry.bed+md.geometry.thickness; Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 13681) @@ -0,0 +1,50 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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.initialization.vx[:]=0. +md.initialization.vy[:]=0. +md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000. +md.geometry.thickness[:]=1300 +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md=setflowequation(md,'macayeal','all') +md.extrude(3,1.) + +md.surfaceforcings.mass_balance[:]=-150 +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='SoftMigration' +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,\ + 1e-10,1e-11,1e-10,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test427.py1 =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py1 (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test427.py1 (revision 13681) @@ -0,0 +1,51 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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.initialization.vx(:)=0 +md.initialization.vy(:)=0 +md.initialization.vel(:)=0 +md.geometry.bed=-700-abs(md.mesh.y-500000)/1000 +md.geometry.bathymetry=-700-abs(md.mesh.y-500000)/1000 +md.geometry.thickness(:)=1300 +md.geometry.surface=md.geometry.bed+md.geometry.thickness +md=setflowequation(md,'macayeal','all') +md.extrude(3,1.) + +md.surfaceforcings.mass_balance(:)=-150 +md.transient.isdiagnostic=0 +md.transient.isgroundingline=1 +md.groundingline.migration='SoftMigration' +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Bed1','Surface1','Thickness1','Floatingice1',\ + 'Bed2','Surface2','Thickness2','Floatingice2',\ + 'Bed3','Surface3','Thickness3','Floatingice3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,\ + 1e-10,1e-11,1e-10,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['MaskElementonfloatingice'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['MaskElementonfloatingice'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test428.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test428.py (revision 13681) @@ -0,0 +1,28 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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,'macayeal','all') +md.diagnostic.isnewton=1 +md.diagnostic.restol=0.0001 +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vel','Pressure'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test429.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test429.py (revision 13681) @@ -0,0 +1,30 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000.) +md=setmask(md,'../Exp/SquareShelf.exp','') +md=parameterize(md,'../Par/SquareSheetShelf.py') +md.extrude(5,1.) +md=setflowequation(md,'pattyn','all') +md.diagnostic.isnewton=1 +md.diagnostic.restol=0.0001 +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09] +field_values=[\ + md.results['DiagnosticSolution'][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/test430.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 13681) @@ -0,0 +1,30 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000.) +md=setmask(md,'../Exp/SquareShelf.exp','') +md=parameterize(md,'../Par/SquareSheetShelf.py') +md.extrude(3,1.) +md=setflowequation(md,'stokes','all') +md.diagnostic.isnewton=1 +md.diagnostic.restol=0.0001 +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-07,1e-07,1e-06,1e-07,1e-07] +field_values=[\ + md.results['DiagnosticSolution'][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/test431.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test431.m (revision 13681) @@ -5,5 +5,5 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; +md.timestepping.time_step=0.; md.thermal.isenthalpy=1; md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test431.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test431.py (revision 13681) @@ -0,0 +1,34 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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.extrude(3,2.) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md.timestepping.time_step=0. +md.thermal.isenthalpy=1 +md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) +md=solve(md,SteadystateSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'] +field_tolerances=[1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-10,1e-10] +field_values=[\ + md.results['SteadystateSolution'][1]['Vx'],\ + md.results['SteadystateSolution'][1]['Vy'],\ + md.results['SteadystateSolution'][1]['Vz'],\ + md.results['SteadystateSolution'][1]['Vel'],\ + md.results['SteadystateSolution'][1]['Pressure'],\ + md.results['SteadystateSolution'][1]['Temperature'],\ + md.results['SteadystateSolution'][1]['Waterfraction'],\ + md.results['SteadystateSolution'][1]['Enthalpy'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test432.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.m (revision 13680) +++ /issm/trunk-jpl/test/NightlyRun/test432.m (revision 13681) @@ -5,5 +5,5 @@ md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; +md.timestepping.time_step=0.; md.thermal.isenthalpy=1; md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test432.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.py (revision 13681) +++ /issm/trunk-jpl/test/NightlyRun/test432.py (revision 13681) @@ -0,0 +1,34 @@ +import numpy +from model import * +from EnumDefinitions import * +from MatlabFuncs import * +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.extrude(3,2.) +md=setflowequation(md,'pattyn','all') +md.cluster=generic('name',oshostname(),'np',3) +md.timestepping.time_step=0. +md.thermal.isenthalpy=1 +md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) +md=solve(md,SteadystateSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'] +field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-13,1e-10,1e-10,1e-10] +field_values=[\ + md.results['SteadystateSolution'][1]['Vx'],\ + md.results['SteadystateSolution'][1]['Vy'],\ + md.results['SteadystateSolution'][1]['Vz'],\ + md.results['SteadystateSolution'][1]['Vel'],\ + md.results['SteadystateSolution'][1]['Pressure'],\ + md.results['SteadystateSolution'][1]['Temperature'],\ + md.results['SteadystateSolution'][1]['Waterfraction'],\ + md.results['SteadystateSolution'][1]['Enthalpy'],\ + ]