Changeset 21166


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

CHG: Removed nc support for test Data, updated Data, Par and matlab functions to use arch

Location:
issm/trunk-jpl
Files:
9 added
9 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/archive/arch.py

    r21151 r21166  
    228228                elif data_type==3:
    229229                        data_size='{0}x{1}'.format(rows,cols)
    230                         data_type_str='vector'
     230                        data_type_str='vector/matrix'
    231231
    232232                result=OrderedDict()
    … …  
    249249        1 : string
    250250        2 : double (scalar)
    251         3 : vector (of type double)
     251        3 : vector or matrix (of type double)
    252252
    253253        """

  • issm/trunk-jpl/src/m/archive/archdisp.m

    r21151 r21166  
    4343                        archive_data{end+1}=fread(fid,1,'double','ieee-be');
    4444                elseif field_type==3
    45                         field_types{end+1}='vector';
     45                        field_types{end+1}='vector/matrix';
    4646                        rows=fread(fid,1,'int','ieee-be');
    4747                        cols=fread(fid,1,'int','ieee-be');

  • issm/trunk-jpl/src/m/archive/archread.m

    r21151 r21166  
    7676        elseif isscalar(format)
    7777                code=2; % scalar
    78         elseif isvector(format)
     78        elseif isvector(format) or ismatrix(format)
    7979                code=3; % vector
    8080        else

  • issm/trunk-jpl/src/m/archive/archwrite.m

    r21151 r21166  
    5151        elseif isscalar(format)
    5252                code=2; % scalar
    53         elseif isvector(format)
    54                 code=3; % vector
     53        elseif (isvector(format) || ismatrix(format))
     54                code=3; % vector or matrix
    5555        else
    56                 error('Error! Please ensure arguments are strings, scalars, or vectors.');
     56                error('Error! Please ensure arguments are strings, scalars, or vectors/matrixes.');
    5757        end
    5858end%}}}

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

    r19527 r21166  
    22
    33%Geometry and observation
    4 x=transpose(ncread('../Data/79North.nc','x'));
    5 y=transpose(ncread('../Data/79North.nc','y'));
    6 vx=transpose(ncread('../Data/79North.nc','vx'));
    7 vy=transpose(ncread('../Data/79North.nc','vy'));
    8 index=transpose(ncread('../Data/79North.nc','index'));
    9 surface=transpose(ncread('../Data/79North.nc','surface'));
    10 thickness=transpose(ncread('../Data/79North.nc','thickness'));
     4x=archread('../Data/79North.nc','x');
     5y=archread('../Data/79North.nc','y');
     6vx=archread('../Data/79North.nc','vx');
     7vy=archread('../Data/79North.nc','vy');
     8index=archread('../Data/79North.nc','index');
     9surface=archread('../Data/79North.nc','surface');
     10thickness=archread('../Data/79North.nc','thickness');
    1111md.initialization.vx =InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    1212md.initialization.vy =InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

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

    r17769 r21166  
    2727
    2828%Initial velocity
    29 x     = transpose(ncread('../Data/SquareSheetConstrained.nc','x'));
    30 y     = transpose(ncread('../Data/SquareSheetConstrained.nc','y'));
    31 vx    = transpose(ncread('../Data/SquareSheetConstrained.nc','vx'));
    32 vy    = transpose(ncread('../Data/SquareSheetConstrained.nc','vy'));
    33 index = transpose(ncread('../Data/SquareSheetConstrained.nc','index'));
     29x     = archread('../Data/SquareSheetConstrained.nc','x');
     30y     = archread('../Data/SquareSheetConstrained.nc','y');
     31vx    = archread('../Data/SquareSheetConstrained.nc','vx');
     32vy    = archread('../Data/SquareSheetConstrained.nc','vy');
     33index = archread('../Data/SquareSheetConstrained.nc','index');
    3434
    3535md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

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

    r17769 r21166  
    2626
    2727%Initial velocity
    28 x     = transpose(ncread('../Data/SquareSheetConstrained.nc','x'));
    29 y     = transpose(ncread('../Data/SquareSheetConstrained.nc','y'));
    30 vx    = transpose(ncread('../Data/SquareSheetConstrained.nc','vx'));
    31 vy    = transpose(ncread('../Data/SquareSheetConstrained.nc','vy'));
    32 index = transpose(ncread('../Data/SquareSheetConstrained.nc','index'));
     28x     = archread('../Data/SquareSheetConstrained.nc','x');
     29y     = archread('../Data/SquareSheetConstrained.nc','y');
     30vx    = archread('../Data/SquareSheetConstrained.nc','vx');
     31vy    = archread('../Data/SquareSheetConstrained.nc','vy');
     32index = archread('../Data/SquareSheetConstrained.nc','index');
    3333
    3434md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

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

    r17769 r21166  
    22
    33disp('      creating thickness');
    4 data=transpose(ncread('../Data/ISMIPE.nc','data'));
     4data=archread('../Data/ISMIPE.nc','data');
    55md.geometry.surface=zeros(md.mesh.numberofvertices,1);
    66md.geometry.base=zeros(md.mesh.numberofvertices,1);

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

    r17769 r21166  
    22
    33%Geometry and observation
    4 x         = transpose(ncread('../Data/Pig.nc','x'));
    5 y         = transpose(ncread('../Data/Pig.nc','y'));
    6 vx_obs    = transpose(ncread('../Data/Pig.nc','vx_obs'));
    7 vy_obs    = transpose(ncread('../Data/Pig.nc','vy_obs'));
    8 index     = transpose(ncread('../Data/Pig.nc','index'));
    9 surface   = transpose(ncread('../Data/Pig.nc','surface'));
    10 thickness = transpose(ncread('../Data/Pig.nc','thickness'));
     4x         = archread('../Data/Pig.nc','x');
     5y         = archread('../Data/Pig.nc','y');
     6vx_obs    = archread('../Data/Pig.nc','vx_obs');
     7vy_obs    = archread('../Data/Pig.nc','vy_obs');
     8index     = archread('../Data/Pig.nc','index');
     9surface   = archread('../Data/Pig.nc','surface');
     10thickness = archread('../Data/Pig.nc','thickness');
    1111md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y);
    1212md.inversion.vy_obs   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y);

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

    r20468 r21166  
    1313
    1414%Initial velocity
    15 x     = transpose(ncread('../Data/SquareSheetConstrained.nc','x'));
    16 y     = transpose(ncread('../Data/SquareSheetConstrained.nc','y'));
    17 vx    = transpose(ncread('../Data/SquareSheetConstrained.nc','vx'));
    18 vy    = transpose(ncread('../Data/SquareSheetConstrained.nc','vy'));
    19 index = transpose(ncread('../Data/SquareSheetConstrained.nc','index'));
     15x     = archread('../Data/SquareSheetConstrained.nc','x');
     16y     = archread('../Data/SquareSheetConstrained.nc','y');
     17vx    = archread('../Data/SquareSheetConstrained.nc','vx');
     18vy    = archread('../Data/SquareSheetConstrained.nc','vy');
     19index = archread('../Data/SquareSheetConstrained.nc','index');
    2020
    2121md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);

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

    r19527 r21166  
    1616
    1717%Initial velocity
    18 x     = transpose(ncread('../Data/SquareSheetShelf.nc','x'));
    19 y     = transpose(ncread('../Data/SquareSheetShelf.nc','y'));
    20 vx    = transpose(ncread('../Data/SquareSheetShelf.nc','vx'));
    21 vy    = transpose(ncread('../Data/SquareSheetShelf.nc','vy'));
    22 index = transpose(ncread('../Data/SquareSheetShelf.nc','index'));
     18x     = archread('../Data/SquareSheetShelf.nc','x');
     19y     = archread('../Data/SquareSheetShelf.nc','y');
     20vx    = archread('../Data/SquareSheetShelf.nc','vx');
     21vy    = archread('../Data/SquareSheetShelf.nc','vy');
     22index = archread('../Data/SquareSheetShelf.nc','index');
    2323md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2424md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

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

    r17769 r21166  
    1313
    1414%Initial velocity and pressure
    15 x     = transpose(ncread('../Data/SquareShelf.nc','x'));
    16 y     = transpose(ncread('../Data/SquareShelf.nc','y'));
    17 vx    = transpose(ncread('../Data/SquareShelf.nc','vx'));
    18 vy    = transpose(ncread('../Data/SquareShelf.nc','vy'));
    19 index = transpose(ncread('../Data/SquareShelf.nc','index'));
     15x     = archread('../Data/SquareShelf.nc','x');
     16y     = archread('../Data/SquareShelf.nc','y');
     17vx    = archread('../Data/SquareShelf.nc','vx');
     18vy    = archread('../Data/SquareShelf.nc','vy');
     19index = archread('../Data/SquareShelf.nc','index');
    2020md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2121md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

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

    r17769 r21166  
    1313
    1414%Initial velocity and pressure
    15 x     = transpose(ncread('../Data/SquareShelf.nc','x'));
    16 y     = transpose(ncread('../Data/SquareShelf.nc','y'));
    17 vx    = transpose(ncread('../Data/SquareShelf.nc','vx'));
    18 vy    = transpose(ncread('../Data/SquareShelf.nc','vy'));
    19 index = transpose(ncread('../Data/SquareShelf.nc','index'));
     15x     = archread('../Data/SquareShelf.nc','x');
     16y     = archread('../Data/SquareShelf.nc','y');
     17vx    = archread('../Data/SquareShelf.nc','vx');
     18vy    = archread('../Data/SquareShelf.nc','vy');
     19index = archread('../Data/SquareShelf.nc','index');
    2020md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2121md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);

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

    r19793 r21166  
    1414
    1515%Initial velocity
    16 x     = transpose(ncread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'x'));
    17 y     = transpose(ncread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'y'));
    18 vx    = transpose(ncread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vx'));
    19 vy    = transpose(ncread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vy'));
    20 index = transpose(ncread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'index'));
     16x     = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'x');
     17y     = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'y');
     18vx    = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vx');
     19vy    = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'vy');
     20index = archread([issmdir() '/test/Data/SquareShelfConstrained.nc'],'index');
    2121md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y);
    2222md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y);
Note: See TracChangeset for help on using the changeset viewer.