Index: ../trunk-jpl/test/NightlyRun/test214.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test214.m (revision 13518) +++ ../trunk-jpl/test/NightlyRun/test214.m (revision 13519) @@ -25,7 +25,7 @@ field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; field_values={... (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.J),... (md.results.DiagnosticSolution.MaterialsRheologyB),... (md.results.DiagnosticSolution.Pressure),... (md.results.DiagnosticSolution.Vel),... Index: ../trunk-jpl/test/NightlyRun/test214.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test214.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test214.py (revision 13519) @@ -0,0 +1,62 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test214.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve 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') + + +# control parameters + +md.inversion.iscontrol=1 +md.inversion.control_parameters=['MaterialsRheologyBbar'] +md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1)) +md.inversion.nsteps=2 +md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1)) +md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1)) +md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1)) +md.inversion.step_threshold=0.3*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','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] +field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08] +field_values=[\ + md.results['DiagnosticSolution'][1]['Gradient1'],\ + md.results['DiagnosticSolution'][1]['J'],\ + md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'] +] Index: ../trunk-jpl/test/NightlyRun/test215.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test215.m (revision 13518) +++ ../trunk-jpl/test/NightlyRun/test215.m (revision 13519) @@ -25,7 +25,7 @@ field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... (md.results.DiagnosticSolution.Gradient1),... - md.results.DiagnosticSolution.J,... + (md.results.DiagnosticSolution.J),... (md.results.DiagnosticSolution.MaterialsRheologyB),... (md.results.DiagnosticSolution.Pressure),... (md.results.DiagnosticSolution.Vel),... Index: ../trunk-jpl/test/NightlyRun/test212.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test212.py (revision 13518) +++ ../trunk-jpl/test/NightlyRun/test212.py (revision 13519) @@ -31,12 +31,12 @@ md.inversion.iscontrol=1 md.inversion.control_parameters=['MaterialsRheologyBbar'] md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1)) -md.inversion.max_parameters=2*10**9*ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1)) md.inversion.nsteps=2 -md.inversion.cost_functions=101*ones((md.inversion.nsteps,1)) +md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1)) md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1)) md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1)) -md.inversion.maxiter_per_step=2*ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1)) md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy Index: ../trunk-jpl/test/NightlyRun/test215.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test215.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test215.py (revision 13519) @@ -0,0 +1,62 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test215.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve 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,'stokes','all') + + +# control parameters + +md.inversion.iscontrol=1 +md.inversion.control_parameters=['MaterialsRheologyBbar'] +md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1)) +md.inversion.nsteps=2 +md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1)) +md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1)) +md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1)) +md.inversion.step_threshold=0.3*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','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] +field_tolerances=[1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09] +field_values=[\ + md.results['DiagnosticSolution'][1]['Gradient1'],\ + md.results['DiagnosticSolution'][1]['J'],\ + md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'] +] Index: ../trunk-jpl/test/NightlyRun/test213.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test213.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test213.py (revision 13519) @@ -0,0 +1,63 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test213.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve 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,'macayeal','all') + + +# control parameters + +md.inversion.iscontrol=1 +md.inversion.control_parameters=['MaterialsRheologyBbar'] +md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1)) +md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1)) +md.inversion.nsteps=2 +md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1)) +md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1)) +md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1)) +md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1)) +md.inversion.step_threshold=0.3*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','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +#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['DiagnosticSolution'][1]['Gradient1'],\ + md.results['DiagnosticSolution'][1]['J'],\ + md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ +] Index: ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test213.py =================================================================== --- ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test213.py (revision 13518) +++ ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test213.py (revision 13519) @@ -1,63 +0,0 @@ -""" -== == == == == == == == == == == == == == == == == == == -Auto generated python script for ISSM: test213.m -Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep -== == == == == == == == == == == == == == == == == == == - -Matlab script conversion into python -translateToPy.py Author: Michael Pellegrin -translateToPy.py Date: 09/24/12 -== == == == == == == == == == == == == == == == == == == -""" - -from MatlabFuncs import * -from model import * -from EnumDefinitions import * -from numpy import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve 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,'macayeal','all') - - -# control parameters - -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1) -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1) -md.inversion.nsteps=2 -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1) -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1) -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1) -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1) -md.inversion.step_threshold=0.3*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' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -#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['DiagnosticSolution'][1]['Gradient1'],\ - md.results['DiagnosticSolution'][1]['J'],\ - md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\ - md.results['DiagnosticSolution'][1]['Pressure'],\ - md.results['DiagnosticSolution'][1]['Vel'],\ - md.results['DiagnosticSolution'][1]['Vx'],\ - md.results['DiagnosticSolution'][1]['Vy'],\ -] Index: ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test214.py =================================================================== --- ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test214.py (revision 13518) +++ ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test214.py (revision 13519) @@ -1,61 +0,0 @@ -""" -== == == == == == == == == == == == == == == == == == == -Auto generated python script for ISSM: test214.m -Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep -== == == == == == == == == == == == == == == == == == == - -Matlab script conversion into python -translateToPy.py Author: Michael Pellegrin -translateToPy.py Date: 09/24/12 -== == == == == == == == == == == == == == == == == == == -""" - -from MatlabFuncs import * -from model import * -from EnumDefinitions import * -from numpy import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve 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') - - -# control parameters - -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1) -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1) -md.inversion.nsteps=2 -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1) -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1) -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1) -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1) -md.inversion.step_threshold=0.3*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' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'] -field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08] -field_values=[\ - md.results['DiagnosticSolution.Gradient1),\ - md.results.DiagnosticSolution.J,\ - md.results['DiagnosticSolution.MaterialsRheologyB),\ - md.results['DiagnosticSolution'][1]['Pressure'],\ - md.results['DiagnosticSolution'][1]['Vel'],\ - md.results['DiagnosticSolution'][1]['Vx'],\ - md.results['DiagnosticSolution'][1]['Vy'] -] Index: ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test215.py =================================================================== --- ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test215.py (revision 13518) +++ ../trunk-jpl/test/NightlyRun/InNeedOfDebugging/test215.py (revision 13519) @@ -1,61 +0,0 @@ -""" -== == == == == == == == == == == == == == == == == == == -Auto generated python script for ISSM: test215.m -Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep -== == == == == == == == == == == == == == == == == == == - -Matlab script conversion into python -translateToPy.py Author: Michael Pellegrin -translateToPy.py Date: 09/24/12 -== == == == == == == == == == == == == == == == == == == -""" - -from MatlabFuncs import * -from model import * -from EnumDefinitions import * -from numpy import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve 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,'stokes','all') - - -# control parameters - -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1) -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1) -md.inversion.nsteps=2 -md.inversion.cost_functions=101*ones(md.inversion.nsteps,1) -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1) -md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1) -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1) -md.inversion.step_threshold=0.3*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' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'] -field_tolerances=[1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09] -field_values=[\ - md.results['DiagnosticSolution.Gradient1),\ - md.results.DiagnosticSolution.J,\ - md.results['DiagnosticSolution.MaterialsRheologyB),\ - md.results['DiagnosticSolution'][1]['Pressure'],\ - md.results['DiagnosticSolution'][1]['Vel'],\ - md.results['DiagnosticSolution'][1]['Vx'],\ - md.results['DiagnosticSolution'][1]['Vy'] -]