Ignore:
Timestamp:
11/29/11 19:29:01 (13 years ago)
Author:
Eric.Larour
Message:

merged trunk-jpl and trunk for revision 10980

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/test/NightlyRun/test1501.m

    r9766 r10981  
    2121for i=1:10
    2222         md=solve(md,PrognosticSolutionEnum);
    23          md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - (PatchToVec(md.results.PrognosticSolution.Thickness)-md.geometry.thickness);
     23         md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness);
    2424end
    2525
    … …  
    4747        1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10};
    4848field_values={...
    49         PatchToVec(md.results.TransientSolution(400).Vx),...
    50         PatchToVec(md.results.TransientSolution(400).Vy),...
    51         PatchToVec(md.results.TransientSolution(400).Vel),...
    52         PatchToVec(md.results.TransientSolution(400).Pressure),...
    53         PatchToVec(md.results.TransientSolution(400).Bed),...
    54         PatchToVec(md.results.TransientSolution(400).Surface),...
    55         PatchToVec(md.results.TransientSolution(400).Thickness),...
    56         PatchToVec(md.results.TransientSolution(400).SurfaceforcingsMassBalance),...
    57         PatchToVec(md.results.TransientSolution(800).Vx),...
    58         PatchToVec(md.results.TransientSolution(800).Vy),...
    59         PatchToVec(md.results.TransientSolution(800).Vel),...
    60         PatchToVec(md.results.TransientSolution(800).Pressure),...
    61         PatchToVec(md.results.TransientSolution(800).Bed),...
    62         PatchToVec(md.results.TransientSolution(800).Surface),...
    63         PatchToVec(md.results.TransientSolution(800).Thickness),...
    64         PatchToVec(md.results.TransientSolution(800).SurfaceforcingsMassBalance),...
    65         PatchToVec(md.results.TransientSolution(1200).Vx),...
    66         PatchToVec(md.results.TransientSolution(1200).Vy),...
    67         PatchToVec(md.results.TransientSolution(1200).Vel),...
    68         PatchToVec(md.results.TransientSolution(1200).Pressure),...
    69         PatchToVec(md.results.TransientSolution(1200).Bed),...
    70         PatchToVec(md.results.TransientSolution(1200).Surface),...
    71         PatchToVec(md.results.TransientSolution(1200).Thickness),...
    72         PatchToVec(md.results.TransientSolution(1200).SurfaceforcingsMassBalance),...
    73         PatchToVec(md.results.TransientSolution(1600).Vx),...
    74         PatchToVec(md.results.TransientSolution(1600).Vy),...
    75         PatchToVec(md.results.TransientSolution(1600).Vel),...
    76         PatchToVec(md.results.TransientSolution(1600).Pressure),...
    77         PatchToVec(md.results.TransientSolution(1600).Bed),...
    78         PatchToVec(md.results.TransientSolution(1600).Surface),...
    79         PatchToVec(md.results.TransientSolution(1600).Thickness),...
    80         PatchToVec(md.results.TransientSolution(1600).SurfaceforcingsMassBalance),...
    81         PatchToVec(md.results.TransientSolution(2000).Vx),...
    82         PatchToVec(md.results.TransientSolution(2000).Vy),...
    83         PatchToVec(md.results.TransientSolution(2000).Vel),...
    84         PatchToVec(md.results.TransientSolution(2000).Pressure),...
    85         PatchToVec(md.results.TransientSolution(2000).Bed),...
    86         PatchToVec(md.results.TransientSolution(2000).Surface),...
    87         PatchToVec(md.results.TransientSolution(2000).Thickness),...
    88         PatchToVec(md.results.TransientSolution(2000).SurfaceforcingsMassBalance),...
     49        (md.results.TransientSolution(400).Vx),...
     50        (md.results.TransientSolution(400).Vy),...
     51        (md.results.TransientSolution(400).Vel),...
     52        (md.results.TransientSolution(400).Pressure),...
     53        (md.results.TransientSolution(400).Bed),...
     54        (md.results.TransientSolution(400).Surface),...
     55        (md.results.TransientSolution(400).Thickness),...
     56        (md.results.TransientSolution(400).SurfaceforcingsMassBalance),...
     57        (md.results.TransientSolution(800).Vx),...
     58        (md.results.TransientSolution(800).Vy),...
     59        (md.results.TransientSolution(800).Vel),...
     60        (md.results.TransientSolution(800).Pressure),...
     61        (md.results.TransientSolution(800).Bed),...
     62        (md.results.TransientSolution(800).Surface),...
     63        (md.results.TransientSolution(800).Thickness),...
     64        (md.results.TransientSolution(800).SurfaceforcingsMassBalance),...
     65        (md.results.TransientSolution(1200).Vx),...
     66        (md.results.TransientSolution(1200).Vy),...
     67        (md.results.TransientSolution(1200).Vel),...
     68        (md.results.TransientSolution(1200).Pressure),...
     69        (md.results.TransientSolution(1200).Bed),...
     70        (md.results.TransientSolution(1200).Surface),...
     71        (md.results.TransientSolution(1200).Thickness),...
     72        (md.results.TransientSolution(1200).SurfaceforcingsMassBalance),...
     73        (md.results.TransientSolution(1600).Vx),...
     74        (md.results.TransientSolution(1600).Vy),...
     75        (md.results.TransientSolution(1600).Vel),...
     76        (md.results.TransientSolution(1600).Pressure),...
     77        (md.results.TransientSolution(1600).Bed),...
     78        (md.results.TransientSolution(1600).Surface),...
     79        (md.results.TransientSolution(1600).Thickness),...
     80        (md.results.TransientSolution(1600).SurfaceforcingsMassBalance),...
     81        (md.results.TransientSolution(2000).Vx),...
     82        (md.results.TransientSolution(2000).Vy),...
     83        (md.results.TransientSolution(2000).Vel),...
     84        (md.results.TransientSolution(2000).Pressure),...
     85        (md.results.TransientSolution(2000).Bed),...
     86        (md.results.TransientSolution(2000).Surface),...
     87        (md.results.TransientSolution(2000).Thickness),...
     88        (md.results.TransientSolution(2000).SurfaceforcingsMassBalance),...
    8989        };
    9090
    … …  
    106106        velocity = [];
    107107        for t=starttime:endtime
    108                 thickness = [thickness PatchToVec(md.results.TransientSolution(t).Thickness)];
     108                thickness = [thickness (md.results.TransientSolution(t).Thickness)];
    109109                volume = [volume mean(md.results.TransientSolution(t).Thickness.value,2).*areas];
    110                 massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceforcingsMassBalance)];
    111                 velocity = [velocity PatchToVec(md.results.TransientSolution(t).Vel)];
     110                massbal = [massbal (md.results.TransientSolution(t).SurfaceforcingsMassBalance)];
     111                velocity = [velocity (md.results.TransientSolution(t).Vel)];
    112112        end
    113113
Note: See TracChangeset for help on using the changeset viewer.