Changeset 13643


Ignore:
Timestamp:
10/12/12 14:41:37 (12 years ago)
Author:
jschierm
Message:

NEW: Working test310.py through test319.py (along with cosmetic matlab changes).

Location:
issm/trunk-jpl/test/NightlyRun
Files:
10 added
16 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/python_skipped_tests.txt

    r13581 r13643  
    33test234    needs Dakota
    44test235    needs Dakota
    5 
     5test274    needs TriMeshProcessRifts module in meshprocessrifts.py
  • issm/trunk-jpl/test/NightlyRun/test119.m

    r13581 r13643  
    1717
    1818%Fields and tolerances to track changes
    19 field_names     ={'x1' 'y1' 'x2' 'y2' 'nbelements' 'elapsed time'};
    20 field_tolerances={1e-13 1e-13 1e-13 1e-13 1e-13 0.5};
     19field_names     ={'x1','y1','x2','y2','nbelements','elapsed time'};
     20field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,0.5};
    2121field_values={...
    2222        x1, y1,...
  • issm/trunk-jpl/test/NightlyRun/test212.m

    r13581 r13643  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'};
    2424field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
  • issm/trunk-jpl/test/NightlyRun/test213.m

    r13581 r13643  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'};
    2525field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2626field_values={...
  • issm/trunk-jpl/test/NightlyRun/test214.m

    r13581 r13643  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'};
    2525field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
    2626field_values={...
  • issm/trunk-jpl/test/NightlyRun/test215.m

    r13581 r13643  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'};
    2525field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
  • issm/trunk-jpl/test/NightlyRun/test310.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'','');
     
    77md.prognostic.spcthickness=md.geometry.thickness;
    88md.cluster=generic('name',oshostname(),'np',3);
    9 md=solve(md,PrognosticSolutionEnum);
     9md=solve(md,PrognosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test311.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    55md=extrude(md,5,0.5);
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,PrognosticSolutionEnum);
     7md=solve(md,PrognosticSolutionEnum());
    88
    99%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test312.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);
    55md=setflowequation(md,'macayeal','all');
    6 md.timestepping.time_step=0;
     6md.timestepping.time_step=0.;
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md=solve(md,ThermalSolutionEnum);
     8md=solve(md,ThermalSolutionEnum());
    99
    1010%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test313.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    1010md.transient.isthermal=1;
    1111md.transient.isgroundingline=0;
    12 md=solve(md,TransientSolutionEnum);
     12md=solve(md,TransientSolutionEnum());
    1313
    1414%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test314.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setflowequation(md,'hutter','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,TransientSolutionEnum);
     6md=solve(md,TransientSolutionEnum());
    77
    88%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test315.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    55md=setflowequation(md,'hutter','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    13 field_tolerances={1e-13,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
    14                                                 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    15                                                 1e-10,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
     11        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',...
     12        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     13field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
     14        1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     15        1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1616field_values={...
    1717        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test316.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,TransientSolutionEnum);
     6md=solve(md,TransientSolutionEnum());
    77
    88%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test317.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',200000);
     1md=triangle(model(),'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
     11        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',...
     12        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    14                                                 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    15                                                 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
     14        1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
     15        1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
    1616field_values={...
    1717        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test318.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes
    1111field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
    12 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    13 };
     12field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1413field_values={...
    1514        (md.results.SteadystateSolution.Vx),...
  • issm/trunk-jpl/test/NightlyRun/test319.m

    r12803 r13643  
    1 md=triangle(model,'../Exp/Square.exp',200000);
     1md=triangle(model(),'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
     
    77md.inversion.iscontrol=1;
    88md.inversion.control_parameters={'FrictionCoefficient'};
    9 md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1);
    10 md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1);
     9md.inversion.min_parameters=1.*ones(md.mesh.numberofvertices,1);
     10md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1111md.inversion.nsteps=2;
    1212md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
    13 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7;
    14 md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1);
     13md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
     14md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);
    1515md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1616md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
     
    1818
    1919md.cluster=generic('name',oshostname(),'np',3);
    20 md=solve(md,DiagnosticSolutionEnum);
     20md=solve(md,DiagnosticSolutionEnum());
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'};
    2424field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
    2626        (md.results.DiagnosticSolution.Gradient1),...
    27         md.results.DiagnosticSolution.J,...
     27        (md.results.DiagnosticSolution.J),...
    2828        (md.results.DiagnosticSolution.FrictionCoefficient),...
    2929        (md.results.DiagnosticSolution.Pressure),...
Note: See TracChangeset for help on using the changeset viewer.