Changeset 13580


Ignore:
Timestamp:
10/10/12 08:30:35 (12 years ago)
Author:
jschierm
Message:

NEW: Working test221.py through test229.py (along with cosmetic matlab changes).

Location:
issm/trunk-jpl/test/NightlyRun
Files:
9 added
7 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/test223.m

    r13486 r13580  
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setflowequation(md,'macayeal','all');
    5 md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50;
     5md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.;
    66md.cluster=generic('name',oshostname(),'np',1);
    77md.prognostic.hydrostatic_adjustment='Incremental';
  • issm/trunk-jpl/test/NightlyRun/test224.m

    r12791 r13580  
    1010%Fields and tolerances to track changes
    1111field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     12        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
     13        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    1414field_tolerances={...
    1515        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
  • issm/trunk-jpl/test/NightlyRun/test225.m

    r12977 r13580  
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    4 md.geometry.bed=md.geometry.bed+50; md.geometry.surface=md.geometry.surface+50;
     4md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.;
    55md=extrude(md,3,1);
    66md=setflowequation(md,'pattyn','all');
     
    1111%Fields and tolerances to track changes
    1212field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,...
  • issm/trunk-jpl/test/NightlyRun/test226.m

    r12791 r13580  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md.timestepping.time_adapt=1;
    7 md.timestepping.final_time=10;
     6md.timestepping.time_adapt=1.;
     7md.timestepping.final_time=10.;
    88md=solve(md,TransientSolutionEnum);
    99
  • issm/trunk-jpl/test/NightlyRun/test227.m

    r12791 r13580  
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.timestepping.time_adapt=1;
    8 md.timestepping.final_time=10;
     7md.timestepping.time_adapt=1.;
     8md.timestepping.final_time=10.;
    99md=solve(md,TransientSolutionEnum);
    1010
    1111%Fields and tolerances to track changes
    1212field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
  • issm/trunk-jpl/test/NightlyRun/test228.m

    r12791 r13580  
    55md.cluster=generic('name',oshostname(),'np',3);
    66
    7 md.timestepping.time_step=1;
     7md.timestepping.time_step=1.;
    88md.settings.output_frequency=1;
    9 md.timestepping.final_time=4;
     9md.timestepping.final_time=4.;
    1010
    1111%Set up transient
    12 smb = ones(md.mesh.numberofvertices,1)*3.6;
    13 smb=[ smb smb*-1 ];
     12smb=ones(md.mesh.numberofvertices,1)*3.6;
     13smb=[ smb smb*-1. ];
    1414
    15 md.surfaceforcings.mass_balance= smb;
    16 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3];
     15md.surfaceforcings.mass_balance=smb;
     16md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    1717md.transient.isthermal=0;
    1818
     
    2828        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2929        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
    30 
    3130field_values={...
    3231        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test229.m

    r12791 r13580  
    55md.cluster=generic('name',oshostname(),'np',3);
    66
    7 md.timestepping.time_step=1;
     7md.timestepping.time_step=1.;
    88md.settings.output_frequency=1;
    9 md.timestepping.final_time=4;
     9md.timestepping.final_time=4.;
    1010
    1111%Set up transient
    12 smb = ones(md.mesh.numberofvertices,1)*3.6;
    13 smb=[ smb smb*2 ];
     12smb=ones(md.mesh.numberofvertices,1)*3.6;
     13smb=[ smb smb*2. ];
    1414
    15 md.surfaceforcings.mass_balance= smb;
    16 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3];
     15md.surfaceforcings.mass_balance=smb;
     16md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    1717md.transient.isthermal=0;
    1818
     
    2828        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2929        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
    30 
    3130field_values={...
    3231        (md.results.TransientSolution(1).Vx),...
Note: See TracChangeset for help on using the changeset viewer.