Index: /issm/trunk-jpl/test/NightlyRun/test510.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.m (revision 13661) +++ /issm/trunk-jpl/test/NightlyRun/test510.m (revision 13662) @@ -10,6 +10,5 @@ %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; -field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 -}; +field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; field_values={... (md.results.SteadystateSolution.Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test510.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.py (revision 13662) +++ /issm/trunk-jpl/test/NightlyRun/test510.py (revision 13662) @@ -0,0 +1,30 @@ +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/Pig.exp',20000) +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') +md=parameterize(md,'../Par/Pig.py') +md.extrude(2,1) +md=setflowequation(md,'stokes','all') +md.cluster=generic('name',oshostname(),'np',3) +md.timestepping.time_step=0 +md=solve(md,SteadystateSolutionEnum()) + +# Fields and tolerances to track changes +field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'] +field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06] +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]['BasalforcingsMeltingRate'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test512.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.m (revision 13661) +++ /issm/trunk-jpl/test/NightlyRun/test512.m (revision 13662) @@ -22,5 +22,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'}; field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; field_values={... Index: /issm/trunk-jpl/test/NightlyRun/test512.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.py (revision 13662) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 13662) @@ -0,0 +1,46 @@ +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/Pig.exp',20000.) +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') +md=parameterize(md,'../Par/Pig.py') +md.extrude(3,1.) +md=setflowequation(md,'pattyn','all') + +# control parameters +md.inversion.iscontrol=1 +md.inversion.control_parameters=['FrictionCoefficient'] +md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1)) +md.inversion.nsteps=2 +md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1)))) +md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2)) +md.inversion.cost_functions_coefficients[:,1]=2.*10**-7 +md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1)) +md.inversion.step_threshold=2.99*numpy.ones((md.inversion.nsteps,1)) +md.inversion.vx_obs=md.initialization.vx +md.inversion.vy_obs=md.initialization.vy + +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + +# Fields and tolerances to track changes +field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] +field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11] +field_values=[\ + md.results['DiagnosticSolution'][1]['Gradient1'],\ + md.results['DiagnosticSolution'][1]['J'],\ + md.results['DiagnosticSolution'][1]['FrictionCoefficient'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'] +] Index: /issm/trunk-jpl/test/NightlyRun/test513.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.m (revision 13661) +++ /issm/trunk-jpl/test/NightlyRun/test513.m (revision 13662) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; +field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06}; field_values={... Index: /issm/trunk-jpl/test/NightlyRun/test513.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.py (revision 13662) +++ /issm/trunk-jpl/test/NightlyRun/test513.py (revision 13662) @@ -0,0 +1,50 @@ +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/Pig.exp',30000.) +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') +md=parameterize(md,'../Par/Pig.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') + +# control parameters +md.inversion.iscontrol=1 +md.inversion.control_parameters=['FrictionCoefficient'] +md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1)) +md.inversion.nsteps=2 +md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1)))) +md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2)) +md.inversion.cost_functions_coefficients[:,1]=2.*10**-7 +md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1)) +md.inversion.step_threshold=0.99*numpy.ones((md.inversion.nsteps,1)) +md.inversion.vx_obs=md.initialization.vx +md.inversion.vy_obs=md.initialization.vy +md.timestepping.time_step=0 + +md.thermal.penalty_lock=5 +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,SteadystateSolutionEnum()) + +# Fields and tolerances to track changes +field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'] +field_tolerances=[1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06] +field_values=[\ + md.results['SteadystateSolution'][1]['Gradient1'],\ + md.results['SteadystateSolution'][1]['J'],\ + md.results['SteadystateSolution'][1]['FrictionCoefficient'],\ + md.results['SteadystateSolution'][1]['Pressure'],\ + md.results['SteadystateSolution'][1]['Vel'],\ + md.results['SteadystateSolution'][1]['Vx'],\ + md.results['SteadystateSolution'][1]['Vy'],\ + md.results['SteadystateSolution'][1]['Vz'],\ + md.results['SteadystateSolution'][1]['Temperature'],\ + md.results['SteadystateSolution'][1]['BasalforcingsMeltingRate'] +] Index: /issm/trunk-jpl/test/NightlyRun/test514.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test514.m (revision 13661) +++ /issm/trunk-jpl/test/NightlyRun/test514.m (revision 13662) @@ -44,6 +44,6 @@ %Fields and tolerances to track changes -field_names ={'x1' 'y1' 'x2' 'y2' 'x3' 'y3' 'x4' 'y4' 'x5' 'y5' 'x6' 'y6' 'x7' 'y7' }; -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}; +field_names ={'x1y1x2y2x3y3x4y4x5y5x6y6' 'x7y7' }; +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}; field_values={... x1, y1,... Index: /issm/trunk-jpl/test/NightlyRun/test515.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.py (revision 13662) +++ /issm/trunk-jpl/test/NightlyRun/test515.py (revision 13662) @@ -0,0 +1,32 @@ +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/Pig.exp',30000) +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') +md=parameterize(md,'../Par/Pig.py') +md.extrude(3,1) +md=setflowequation(md,'pattyn','all') +md.thermal.stabilization=2 +md.cluster=generic('name',oshostname(),'np',3) +md.transient.isdiagnostic=0 +md.transient.isprognostic=0 +md.transient.isthermal=1 +md.transient.isgroundingline=0 +md=solve(md,TransientSolutionEnum()) + +# Fields and tolerances to track changes +field_names =['Temperature1','BasalforcingsMeltingRate1', \ + 'Temperature2','BasalforcingsMeltingRate2'] +field_tolerances=[1e-13,1e-8,1e-13,1e-8] +field_values=[\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + ]