Changeset 13582


Ignore:
Timestamp:
10/10/12 10:28:32 (12 years ago)
Author:
jschierm
Message:

NEW: Working test230.py through test233.py (along with cosmetic matlab changes).

Location:
issm/trunk-jpl/test/NightlyRun
Files:
4 added
8 edited

Legend:

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

    r12791 r13582  
    1 md=triangle(model,'../Exp/Square.exp',350000);
     1md=triangle(model(),'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    1111
    1212%Set up transient
    13 smb = ones(md.mesh.numberofvertices,1)*3.6;
    14 smb=[ smb smb*-1 ];
     13smb=ones(md.mesh.numberofvertices,1)*3.6;
     14smb=[ smb smb*-1. ];
    1515
    16 md.surfaceforcings.mass_balance= smb;
    17 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3];
     16md.surfaceforcings.mass_balance=smb;
     17md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    1818md.transient.isthermal=0;
    1919
    20 md=solve(md,TransientSolutionEnum);
     20md=solve(md,TransientSolutionEnum());
    2121
    2222%Fields and tolerances to track changes
    2323field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
    2424        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     
    2929        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    3030        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    31 
    3231field_values={...
    3332        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test231.m

    r12791 r13582  
    1 md=triangle(model,'../Exp/Square.exp',350000);
     1md=triangle(model(),'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    1111
    1212%Set up transient
    13 smb = ones(md.mesh.numberofvertices,1)*3.6;
    14 smb=[ smb smb*2 ];
     13smb=ones(md.mesh.numberofvertices,1)*3.6;
     14smb=[ smb smb*2. ];
    1515
    16 md.surfaceforcings.mass_balance= smb;
    17 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3];
     16md.surfaceforcings.mass_balance=smb;
     17md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    1818md.transient.isthermal=0;
    1919
    20 md=solve(md,TransientSolutionEnum);
     20md=solve(md,TransientSolutionEnum());
    2121
    2222%Fields and tolerances to track changes
    2323field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
    2424        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     
    2929        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    3030        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    31 
    3231field_values={...
    3332        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test232.m

    r12791 r13582  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5, md.thermal.spctemperature+10, md.thermal.spctemperature+15; 1.5 2.5 3.5 4];
     7md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5., md.thermal.spctemperature+10., md.thermal.spctemperature+15.; 1.5 2.5 3.5 4.];
    88md.timestepping.time_step=1;
    99md.timestepping.final_time=4;
     
    1212md.transient.isthermal=1;
    1313md.transient.isgroundingline=0;
    14 md=solve(md,TransientSolutionEnum);
     14md=solve(md,TransientSolutionEnum());
    1515
    1616%Fields and tolerances to track changes
  • issm/trunk-jpl/test/NightlyRun/test233.m

    r12791 r13582  
    1 md=triangle(model,'../Exp/Square.exp',200000);
     1md=triangle(model(),'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5; 1 2];
     7md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5.; 1. 2.];
    88md.timestepping.time_step=0.5;
    9 md.timestepping.final_time=2;
    10 md=solve(md,TransientSolutionEnum);
     9md.timestepping.final_time=2.;
     10md=solve(md,TransientSolutionEnum());
    1111
    1212%Fields and tolerances to track changes
    1313field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    14                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    15                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ...
    16                                            'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'};
     14        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
     15        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ...
     16        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'};
    1717field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ...
    18                                                 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ...
    19                                                 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ...
    20                                                 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
     18        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ...
     19        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ...
     20        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
    2121field_values={...
    2222        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test234.m

    r13021 r13582  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    5555
    5656%solve
    57 md=solve(md,TransientSolutionEnum,'overwrite','y');
     57md=solve(md,TransientSolutionEnum(),'overwrite','y');
    5858md.qmu.results=md.results.dakota;
    5959
  • issm/trunk-jpl/test/NightlyRun/test235.m

    r13021 r13582  
    1 md=triangle(model,'../Exp/Square.exp',180000);
     1md=triangle(model(),'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
     
    5555
    5656%solve
    57 md=solve(md,TransientSolutionEnum,'overwrite','y');
     57md=solve(md,TransientSolutionEnum(),'overwrite','y');
    5858md.qmu.results=md.results.dakota;
    5959
  • issm/trunk-jpl/test/NightlyRun/test236.m

    r12883 r13582  
    1 md=triangle(model,'../Exp/Square.exp',150000);
     1md=triangle(model(),'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33
     
    1919% Same temperature over the all region :
    2020imonth=0:11;
    21 tmonth(1:12)=238.15+20;
     21tmonth(1:12)=238.15+20.;
    2222for imonth=0:11
    2323    md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
    24     md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20;
     24    md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
    2525    % Time for the last line:
    2626    md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     
    4444% time steps and resolution
    4545md.timestepping.time_step=20;
    46 md.timestepping.final_time= 60;
     46md.timestepping.final_time=60;
    4747
    4848%
    4949md=setflowequation(md,'macayeal','all');
    5050md.cluster=generic('name',oshostname(),'np',3);
    51 md=solve(md,TransientSolutionEnum);
    52 
     51md=solve(md,TransientSolutionEnum());
    5352
    5453%Fields and tolerances to track changes
    5554field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
    5655field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    57                                                 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    58                                                 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     56        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     57        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    5958field_values={...
    6059        (md.results.TransientSolution(1).Vx),...
  • issm/trunk-jpl/test/NightlyRun/test237.m

    r12891 r13582  
    1 md=triangle(model,'../Exp/Square.exp',600000);%180000
     1md=triangle(model(),'../Exp/Square.exp',600000);%180000
    22md=setmask(md,'all','');
    33
     
    1919% Same temperature over the all region :
    2020imonth=0:11;
    21 tmonth(1:12)=238.15+20;
     21tmonth(1:12)=238.15+20.;
    2222for imonth=0:11
    2323    md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
    24     md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20;
     24    md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
    2525    % Time for the last line:
    2626    md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     
    4545md.timestepping.time_step=20;
    4646md.settings.output_frequency=1;
    47 md.timestepping.final_time= 60;
     47md.timestepping.final_time=60;
    4848
    4949%
     
    5151md=setflowequation(md,'macayeal','all');
    5252md.cluster=generic('name',oshostname(),'np',3);
    53 md=solve(md,TransientSolutionEnum);
     53md=solve(md,TransientSolutionEnum());
    5454
    5555%Fields and tolerances to track changes
    5656field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    57                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    58                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     57        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
     58        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
    5959field_tolerances={...
    6060        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,...
    6161        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,...
    6262        1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8};
    63 
    6463field_values={...
    6564        (md.results.TransientSolution(1).Vx),...
Note: See TracChangeset for help on using the changeset viewer.