Changeset 19519


Ignore:
Timestamp:
08/25/15 17:13:15 (10 years ago)
Author:
seroussi
Message:

NEW: added grounded area check in NR

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

Legend:

Unmodified
Added
Removed

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

    r19049 r19519  
    55md=setflowequation(md,'SSA','all');
    66md.cluster=generic('name',oshostname(),'np',3);
     7md.transient.requested_outputs={'default','GroundedArea'};
    78md=solve(md,TransientSolutionEnum());
    89
    910%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
    11 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     11field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1',...
     12        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2',...
     13        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3'};
     14field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1215field_values={...
    1316        (md.results.TransientSolution(1).Vx),...
    … …  
    1821        (md.results.TransientSolution(1).Surface),...
    1922        (md.results.TransientSolution(1).Thickness),...
     23        (md.results.TransientSolution(1).GroundedArea),...
    2024        (md.results.TransientSolution(2).Vx),...
    2125        (md.results.TransientSolution(2).Vy),...
    … …  
    2529        (md.results.TransientSolution(2).Surface),...
    2630        (md.results.TransientSolution(2).Thickness),...
     31        (md.results.TransientSolution(2).GroundedArea),...
    2732        (md.results.TransientSolution(3).Vx),...
    2833        (md.results.TransientSolution(3).Vy),...
    … …  
    3237        (md.results.TransientSolution(3).Surface),...
    3338        (md.results.TransientSolution(3).Thickness),...
     39        (md.results.TransientSolution(3).GroundedArea),...
    3440        };

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

    r19049 r19519  
    55md=extrude(md,3,1.);
    66md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties');
    7 md.cluster=generic('name',oshostname(),'np',3);
     7md.cluster=generic('name',oshostname(),'np',1);
     8md.transient.requested_outputs={'default','GroundedArea'};
    89md=solve(md,TransientSolutionEnum());
    910
    1011%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2', ...
     14                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3'};
    1415field_tolerances={...
    15         1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,...
    16         1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,...
    17         1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01};
     16        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-10,...
     17        1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,1e-10,...
     18        1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01,1e-10};
    1819field_values={...
    1920        (md.results.TransientSolution(1).Vx),...
    … …  
    2728        (md.results.TransientSolution(1).Temperature),...
    2829        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
     30        (md.results.TransientSolution(1).GroundedArea),...
    2931        (md.results.TransientSolution(2).Vx),...
    3032        (md.results.TransientSolution(2).Vy),...
    … …  
    4345        (md.results.TransientSolution(3).Pressure),...
    4446        (md.results.TransientSolution(3).Base),...
     47        (md.results.TransientSolution(2).GroundedArea),...
    4548        (md.results.TransientSolution(3).Surface),...
    4649        (md.results.TransientSolution(3).Thickness),...
    4750        (md.results.TransientSolution(3).Temperature),...
    4851        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
     52        (md.results.TransientSolution(3).GroundedArea),...
    4953        };
Note: See TracChangeset for help on using the changeset viewer.