Changeset 19243


Ignore:
Timestamp:
04/02/15 12:10:20 (10 years ago)
Author:
schlegel
Message:

CHG: fix pdd tests so that field names match fields tested, add removal of del18o interpolation tests

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test236.m

    r19049 r19243  
    7070
    7171%Fields and tolerances to track changes
    72 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
    73 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    74         1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    75         1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     72field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMonthlytemperatures1','SurfaceforcingsMassBalance1',...
     73           'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMonthlytemperatures2','SurfaceforcingsMassBalance2',...
     74           'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMonthlytemperatures3','SurfaceforcingsMassBalance3'};
     75field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     76        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     77        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    7678field_values={...
    7779        (md.results.TransientSolution(1).Vx),...

  • issm/trunk-jpl/test/NightlyRun/test237.m

    r19049 r19243  
    7575
    7676%Fields and tolerances to track changes
    77 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
    78                                                 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
    79                                                 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
     77field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','SurfaceforcingsMonthlytemperatures1','SurfaceforcingsMassBalance1',...
     78                                                'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','SurfaceforcingsMonthlytemperatures2','SurfaceforcingsMassBalance2',...
     79                                                'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','SurfaceforcingsMonthlytemperatures3','SurfaceforcingsMassBalance3'};
    8080field_tolerances={...
    81         1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,...
    82         1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,...
    83         1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8};
     81        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,...
     82        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,...
     83        1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13};
    8484field_values={...
    8585        (md.results.TransientSolution(1).Vx),...

  • issm/trunk-jpl/test/NightlyRun/test238.m

    r19049 r19243  
    1 %Test Name: SquareShelfTranForceNoInterp2d
     1%Test Name: SquareShelfTranIspddIsdeltaO18pdSSA2d
    22md=triangle(model(),'../Exp/Square.exp',150000.);
    33md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelf.par');
     5
     6%md.verbose=verbose('all');
     7
     8% Use of ispdd and isdelta18o methods
     9md.surfaceforcings = SMBd18opdd();
     10md.surfaceforcings.isd18opd=1;
     11%md.surfaceforcings.precipitation(1:md.mesh.numberofvertices,1:12)=0;
     12%md.surfaceforcings.monthlytemperatures(1:md.mesh.numberofvertices,1:12)=273;
     13
     14% Add temperature, precipitation and delta18o needed to measure the surface mass balance
     15%  creating delta18o
     16load '../Data/delta18o.data'
     17md.surfaceforcings.delta18o=delta18o;
     18
     19% creating Present day  temperatures
     20% Same temperature over the all region:
     21tmonth(1:12)=238.15+20.;
     22for imonth=0:11
     23    md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
     24    % Time for the last line:
     25    md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     26end
     27
     28% creating initialization and spc temperatures initialization and
     29% spc
     30md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1:12),2)-10; %-10*ones(md.mesh.numberofvertices,1);
     31
     32md.initialization.temperature=md.thermal.spctemperature; %md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1);
     33
     34% creating precipitation
     35for imonth=0:11
     36    md.surfaceforcings.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     37    % Time for the last line:
     38    md.surfaceforcings.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     39end
     40
     41% time steps and resolution
     42md.timestepping.time_step=20;
     43md.settings.output_frequency=1;
     44md.timestepping.final_time=60;
     45
     46%
     47md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'};
    548md=setflowequation(md,'SSA','all');
    6 md.cluster=generic('name',oshostname(),'np',3);
    7 
    8 md.timestepping.time_step=1.;
    9 md.settings.output_frequency=1;
    10 md.timestepping.final_time=4.;
    11 md.timestepping.interp_forcings=0;
    12 
    13 %Set up transient
    14 smb=ones(md.mesh.numberofvertices,1)*3.6;
    15 smb=[ smb smb*-1. ];
    16 
    17 md.surfaceforcings.mass_balance=smb;
    18 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    19 md.transient.isthermal=0;
    20 
     49md.cluster=generic('name',oshostname(),'np',1); % 3 for the cluster
    2150md=solve(md,TransientSolutionEnum());
    2251
    2352%Fields and tolerances to track changes
    24 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
    25         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
    26         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
    27         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'};
    28 field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    29         1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    30         1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    31         1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
     53field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMonthlytemperatures1','SurfaceforcingsMassBalance1',...
     54              'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMonthlytemperatures2','SurfaceforcingsMassBalance2',...
     55              'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMonthlytemperatures3','SurfaceforcingsMassBalance3'};
     56field_tolerances={1e-13,1e-13,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,1e-13,1e-13,...
     58           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    3259field_values={...
    3360        (md.results.TransientSolution(1).Vx),...
    … …  
    3865        (md.results.TransientSolution(1).Surface),...
    3966        (md.results.TransientSolution(1).Thickness),...
     67        (md.results.TransientSolution(1).SurfaceforcingsMonthlytemperatures),...
    4068        (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4169        (md.results.TransientSolution(2).Vx),...
    … …  
    4674        (md.results.TransientSolution(2).Surface),...
    4775        (md.results.TransientSolution(2).Thickness),...
     76        (md.results.TransientSolution(2).SurfaceforcingsMonthlytemperatures),...
    4877        (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    4978        (md.results.TransientSolution(3).Vx),...
    … …  
    5483        (md.results.TransientSolution(3).Surface),...
    5584        (md.results.TransientSolution(3).Thickness),...
     85        (md.results.TransientSolution(3).SurfaceforcingsMonthlytemperatures),...
    5686        (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    57         (md.results.TransientSolution(4).Vx),...
    58         (md.results.TransientSolution(4).Vy),...
    59         (md.results.TransientSolution(4).Vel),...
    60         (md.results.TransientSolution(4).Pressure),...
    61         (md.results.TransientSolution(4).Base),...
    62         (md.results.TransientSolution(4).Surface),...
    63         (md.results.TransientSolution(4).Thickness),...
    64         (md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6587        };

  • issm/trunk-jpl/test/NightlyRun/test239.m

    r19049 r19243  
    1 %Test Name: SquareShelfTranForceNoInterp3d
    2 md=triangle(model(),'../Exp/Square.exp',350000.);
     1%Test Name: SquareShelfTranIspddIsdeltaO18pdInterpSSA2d
     2md=triangle(model(),'../Exp/Square.exp',150000.);
    33md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelf.par');
    5 md=extrude(md,3,1.);
    6 md=setflowequation(md,'HO','all');
    7 md.cluster=generic('name',oshostname(),'np',3);
    85
    9 md.timestepping.time_step=1;
     6%md.verbose=verbose('all');
     7
     8% Use of ispdd and isdelta18o methods
     9md.surfaceforcings = SMBd18opdd();
     10md.surfaceforcings.isd18opd=1;
     11%md.surfaceforcings.precipitation(1:md.mesh.numberofvertices,1:12)=0;
     12%md.surfaceforcings.monthlytemperatures(1:md.mesh.numberofvertices,1:12)=273;
     13
     14% Add temperature, precipitation and delta18o needed to measure the surface mass balance
     15%  creating delta18o
     16load '../Data/delta18o.data'
     17md.surfaceforcings.delta18o=delta18o;
     18
     19% creating Present day  temperatures
     20% Same temperature over the all region:
     21tmonth(1:12)=238.15+20.;
     22for imonth=0:11
     23    md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
     24    % Time for the last line:
     25    md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     26end
     27
     28% creating initialization and spc temperatures initialization and
     29% spc
     30md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1:12),2)-10; %-10*ones(md.mesh.numberofvertices,1);
     31
     32md.initialization.temperature=md.thermal.spctemperature; %md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1);
     33
     34% creating precipitation
     35for imonth=0:11
     36    md.surfaceforcings.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     37    % Time for the last line:
     38    md.surfaceforcings.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     39end
     40
     41% time steps and resolution
     42md.timestepping.time_step=0.5;
    1043md.settings.output_frequency=1;
    11 md.timestepping.final_time=4;
    12 md.timestepping.interp_forcings=0;
     44md.timestepping.final_time=2;
    1345
    14 %Set up transient
    15 smb=ones(md.mesh.numberofvertices,1)*3.6;
    16 smb=[ smb smb*-1. ];
    17 
    18 md.surfaceforcings.mass_balance=smb;
    19 md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.];
    20 md.transient.isthermal=0;
    21 
     46%
     47md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'};
     48md=setflowequation(md,'SSA','all');
     49md.cluster=generic('name',oshostname(),'np',1); % 3 for the cluster
    2250md=solve(md,TransientSolutionEnum());
    2351
    2452%Fields and tolerances to track changes
    25 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
    26         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
    27         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
    28         'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassbalance4'};
    29 field_tolerances={...
    30         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13,...
    31         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13,...
    32         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13,...
    33         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13};
     53field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMonthlytemperatures1','SurfaceforcingsMassBalance1',...
     54              'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMonthlytemperatures2','SurfaceforcingsMassBalance2',...
     55              'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMonthlytemperatures3','SurfaceforcingsMassBalance3'};
     56field_tolerances={1e-13,1e-13,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,1e-13,1e-13,...
     58           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    3459field_values={...
    3560        (md.results.TransientSolution(1).Vx),...
    3661        (md.results.TransientSolution(1).Vy),...
    37         (md.results.TransientSolution(1).Vz),...
    3862        (md.results.TransientSolution(1).Vel),...
    3963        (md.results.TransientSolution(1).Pressure),...
    … …  
    4165        (md.results.TransientSolution(1).Surface),...
    4266        (md.results.TransientSolution(1).Thickness),...
     67        (md.results.TransientSolution(1).SurfaceforcingsMonthlytemperatures),...
    4368        (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4469        (md.results.TransientSolution(2).Vx),...
    4570        (md.results.TransientSolution(2).Vy),...
    46         (md.results.TransientSolution(2).Vz),...
    4771        (md.results.TransientSolution(2).Vel),...
    4872        (md.results.TransientSolution(2).Pressure),...
    … …  
    5074        (md.results.TransientSolution(2).Surface),...
    5175        (md.results.TransientSolution(2).Thickness),...
     76        (md.results.TransientSolution(2).SurfaceforcingsMonthlytemperatures),...
    5277        (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    5378        (md.results.TransientSolution(3).Vx),...
    5479        (md.results.TransientSolution(3).Vy),...
    55         (md.results.TransientSolution(3).Vz),...
    5680        (md.results.TransientSolution(3).Vel),...
    5781        (md.results.TransientSolution(3).Pressure),...
    … …  
    5983        (md.results.TransientSolution(3).Surface),...
    6084        (md.results.TransientSolution(3).Thickness),...
     85        (md.results.TransientSolution(3).SurfaceforcingsMonthlytemperatures),...
    6186        (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    62         (md.results.TransientSolution(4).Vx),...
    63         (md.results.TransientSolution(4).Vy),...
    64         (md.results.TransientSolution(4).Vz),...
    65         (md.results.TransientSolution(4).Vel),...
    66         (md.results.TransientSolution(4).Pressure),...
    67         (md.results.TransientSolution(4).Base),...
    68         (md.results.TransientSolution(4).Surface),...
    69         (md.results.TransientSolution(4).Thickness),...
    70         (md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    7187        };

  • issm/trunk-jpl/test/NightlyRun/test240.m

    r19200 r19243  
    1 %Test Name: SquareShelfTranIspddIsdeltaO18pdSSA2d
     1%Test Name: SquareShelfTranIspddIsdeltaO18pdNoInterpSSA2d
    22md=triangle(model(),'../Exp/Square.exp',150000.);
    33md=setmask(md,'all','');
    … …  
    4040
    4141% time steps and resolution
    42 md.timestepping.time_step=20;
     42md.timestepping.time_step=0.5;
    4343md.settings.output_frequency=1;
    44 md.timestepping.final_time=60;
     44md.timestepping.final_time=2;
     45md.timestepping.interp_forcings=0;
    4546
    4647%
    … …  
    5152
    5253%Fields and tolerances to track changes
    53 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
    54 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    55         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};
     54field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMonthlytemperatures1','SurfaceforcingsMassBalance1',...
     55              'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMonthlytemperatures2','SurfaceforcingsMassBalance2',...
     56              'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMonthlytemperatures3','SurfaceforcingsMassBalance3'};
     57field_tolerances={1e-13,1e-13,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,1e-13,1e-13,...
     59           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    5760field_values={...
    5861        (md.results.TransientSolution(1).Vx),...
Note: See TracChangeset for help on using the changeset viewer.