Changeset 21168


Ignore:
Timestamp:
08/25/16 17:58:10 (9 years ago)
Author:
agscott1
Message:

BUG: Updated par files to use contents of the returned cell array from archread

Location:
issm/trunk-jpl/test/Par
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/Par/79North.par

    r21167 r21168  
    99surface = archread('../Data/79North.arch','surface');
    1010thickness = archread('../Data/79North.arch','thickness');
     11x = x{1};
     12y = y{1};
     13vx = vx{1};
     14vy = vy{1};
     15index = index{1};
     16surface = surface{1};
     17thickness = thickness{1};
    1118md.initialization.vx =InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    1219md.initialization.vy =InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/GiaBenchmarksAB.par

    r21167 r21168  
    3232vy    = archread('../Data/SquareSheetConstrained.arch','vy');
    3333index = archread('../Data/SquareSheetConstrained.arch','index');
     34
     35x = x{1};
     36y = y{1};
     37vx = vx{1};
     38vy = vy{1};
     39index = index{1};
    3440
    3541md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/GiaBenchmarksCD.par

    r21167 r21168  
    3131vy    = archread('../Data/SquareSheetConstrained.arch','vy');
    3232index = archread('../Data/SquareSheetConstrained.arch','index');
     33
     34x = x{1};
     35y = y{1};
     36vx = vx{1};
     37vy = vy{1};
     38index = index{1};
    3339
    3440md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/ISMIPE.par

    r21167 r21168  
    33disp('      creating thickness');
    44data=archread('../Data/ISMIPE.arch','data');
     5data = data{1};
    56md.geometry.surface=zeros(md.mesh.numberofvertices,1);
    67md.geometry.base=zeros(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/Par/Pig.par

    r21167 r21168  
    99surface   = archread('../Data/Pig.arch','surface');
    1010thickness = archread('../Data/Pig.arch','thickness');
     11
     12x                        = x{1};
     13y                        = y{1};
     14vx_obs   = vx_obs{1};
     15vy_obs   = vy_obs{1};
     16index            = index{1};
     17surface  = surface{1};
     18thickness = thickness{1};
     19
    1120md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y);
    1221md.inversion.vy_obs   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.par

    r21167 r21168  
    1818vy    = archread('../Data/SquareSheetConstrained.arch','vy');
    1919index = archread('../Data/SquareSheetConstrained.arch','index');
     20
     21x = x{1};
     22y = y{1};
     23vx = vx{1};
     24vy = vy{1};
     25index = index{1};
    2026
    2127md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/SquareSheetShelf.par

    r21167 r21168  
    2121vy    = archread('../Data/SquareSheetShelf.arch','vy');
    2222index = archread('../Data/SquareSheetShelf.arch','index');
     23x = x{1};
     24y = y{1};
     25vx = vx{1};
     26vy = vy{1};
     27index = index{1};
    2328md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2429md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/SquareShelf.par

    r21167 r21168  
    1818vy    = archread('../Data/SquareShelf.arch','vy');
    1919index = archread('../Data/SquareShelf.arch','index');
     20x = x{1};
     21y = y{1};
     22vx = vx{1};
     23vy = vy{1};
     24index = index{1};
    2025md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2126md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/SquareShelf2.par

    r21167 r21168  
    1818vy    = archread('../Data/SquareShelf.arch','vy');
    1919index = archread('../Data/SquareShelf.arch','index');
     20x = x{1};
     21y = y{1};
     22vx = vx{1};
     23vy = vy{1};
     24index = index{1};
    2025md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2126md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.par

    r21167 r21168  
    1919vy    = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'vy');
    2020index = archread([issmdir() '/test/Data/SquareShelfConstrained.arch'],'index');
     21x = x{1};
     22y = y{1};
     23vx = vx{1};
     24vy = vy{1};
     25index = index{1};
    2126md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2227md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);
Note: See TracChangeset for help on using the changeset viewer.