Changeset 1680


Ignore:
Timestamp:
08/14/09 09:51:16 (16 years ago)
Author:
seroussi
Message:

removed part and tpart in ice

Location:
issm/trunk/src/m/solutions/ice
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/solutions/ice/CreateFemModel.m

    r929 r1680  
    1313
    1414%First, build elements,grids,loads, etc ... for horizontal model
    15 [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessor(md,solutiontype);
     15[elements,grids,loads,constraints,materials]=ModelProcessor(md,solutiontype);
    1616       
    1717%generate degrees of freedom
    … …  
    4242m.constraints=constraints;
    4343m.materials=materials;
    44 m.part=part;
    45 m.tpart=tpart;
    4644m.ys=ys;
    4745m.gridset=gridset;

  • issm/trunk/src/m/solutions/ice/Loadresults.m

    r914 r1680  
    1515                indy=2:6:m_dh.gridset.gsize;
    1616                indp=4:6:m_dh.gridset.gsize;
    17                 indx=indx(m_dh.tpart);
    18                 indy=indy(m_dh.tpart);
    19                 indp=indp(m_dh.tpart);
    2017        else
    2118                m_dhu=fem.m_dhu;
    … …  
    2320                indy=2:6:m_dhu.gridset.gsize;
    2421                indp=4:6:m_dhu.gridset.gsize;
    25                 indx=indx(m_dhu.tpart);
    26                 indy=indy(m_dhu.tpart);
    27                 indp=indp(m_dhu.tpart);
    2822        end
    2923
    … …  
    4236        indz=3:6:m_dv.gridset.gsize;
    4337        indp=4:6:m_dv.gridset.gsize;
    44         indx=indx(m_dv.tpart);
    45         indy=indy(m_dv.tpart);
    46         indz=indz(m_dv.tpart);
    47         indp=indp(m_dv.tpart);
    4838
    4939        md.results.diagnostic.step=1;

  • issm/trunk/src/m/solutions/ice/ModelProcessor.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessor(md,solutiontype),
     1function [elements,grids,loads,constraints,materials]=ModelProcessor(md,solutiontype),
    22%MODELPROCESSOR - process model for a given solution sequence
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessor(md,solutiontype)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessor(md,solutiontype)
    1212
    1313if strcmpi(solutiontype,'diagnostic_horiz'),
    14         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHoriz(md);
     14        [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHoriz(md);
    1515elseif strcmpi(solutiontype,'diagnostic_vert'),
    16         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticVert(md);
     16        [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticVert(md);
    1717elseif strcmpi(solutiontype,'diagnostic_hutter'),
    18         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHutter(md);
     18        [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHutter(md);
    1919elseif strcmpi(solutiontype,'thermalsteady')| strcmpi(solutiontype,'thermaltransient'),
    20         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorThermal(md,solutiontype);
     20        [elements,grids,loads,constraints,materials]=ModelProcessorThermal(md,solutiontype);
    2121elseif strcmpi(solutiontype,'meltingsteady')| strcmpi(solutiontype,'meltingtransient'),
    22         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorMelting(md,solutiontype);
     22        [elements,grids,loads,constraints,materials]=ModelProcessorMelting(md,solutiontype);
    2323elseif strcmpi(solutiontype,'prognostic'),
    24         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorPrognostic(md);
     24        [elements,grids,loads,constraints,materials]=ModelProcessorPrognostic(md);
    2525elseif strcmpi(solutiontype,'diagnostic_stokes'),
    26         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticStokes(md);
     26        [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticStokes(md);
    2727elseif strcmpi(solutiontype,'bed_slope_compute') | strcmpi(solutiontype, 'surface_slope_compute'),
    28         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorSlopeCompute(md,solutiontype);
     28        [elements,grids,loads,constraints,materials]=ModelProcessorSlopeCompute(md,solutiontype);
    2929
    3030else

  • issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHoriz.m

    r1651 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHoriz(md);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHoriz(md);
    22%MODELPROCESSORDIAGNOSTICHORIZ - process model for an horizontal diagnostic solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHoriz(md)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHoriz(md)
    1212
    1313%Allocate grids and elements
    … …  
    268268end
    269269
    270 %Last thing, return a partitioning vector, and its transpose.
    271 [part,tpart]=PartitioningVector(md,grids);
    272 
    273270end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHutter.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHutter(md);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHutter(md);
    22%MODELPROCESSORDIAGNOSTICHUTTER - process model for a Hutter diagnostic solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHutter(md);
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHutter(md);
    1212
    1313%Allocate grids and elements
    … …  
    146146end
    147147
    148 
    149 %Last thing, return a partitioning vector, and its transpose.
    150 [part,tpart]=PartitioningVector(md,grids);
    151148end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticStokes.m

    r1663 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHoriz(md);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHoriz(md);
    22%MODELPROCESSORDIAGNOSTICHORIZ - process model for an horizontal diagnostic solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHoriz(md)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticHoriz(md)
    1212
    1313%Allocate grids and elements
    … …  
    174174end
    175175
    176 
    177 %Last thing, return a partitioning vector, and its transpose.
    178 [part,tpart]=PartitioningVector(md,grids);
    179 
    180 
    181176end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticVert.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticVert(md);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticVert(md);
    22%MODELPROCESSORDIAGNOSTICVERT - process model for a vertical diagnostic solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticVert(md);
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorDiagnosticVert(md);
    1212
    1313%Allocate grids and elements
    … …  
    9494constraints=struct('constraint',cell(0,0));
    9595
    96 %Last thing, return a partitioning vector, and its transpose.
    97 [part,tpart]=PartitioningVector(md,grids);
    98 
    9996end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorMelting.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorMelting(md,solutiontype);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorMelting(md,solutiontype);
    22%MODELPROCESSORMELTING - process model for a melting solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorMelting(md,solutiontype)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorMelting(md,solutiontype)
    1212
    1313%Allocate grids and elements
    … …  
    116116constraints=struct('constraint',cell(0,0));
    117117
    118 %Last thing, return a partitioning vector, and its transpose.
    119 [part,tpart]=PartitioningVector(md,grids);
    120 
    121118end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorPrognostic.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorPrognostic(md);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorPrognostic(md);
    22%MODELPROCESSORPROGNOSTIC - process model for a prognostic solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorPrognostic(md)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorPrognostic(md)
    1212
    1313%Allocate grids and elements
    … …  
    109109end
    110110
    111 %Last thing, return a partitioning vector, and its transpose.
    112 [part,tpart]=PartitioningVector(md,grids);
    113 
    114111end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorSlopeCompute.m

    r1623 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorSlopeCompute(md,solutiontype);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorSlopeCompute(md,solutiontype);
    22%MODELPROCESSORSLOPECOMPUTE - process model for a slope finite element computation
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorSlopeCompute(md,solutiontype)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorSlopeCompute(md,solutiontype)
    1212
    1313%Allocate grids and elements
    … …  
    105105constraints=struct('constraint',cell(0,0));
    106106
    107 %Last thing, return a partitioning vector, and its transpose.
    108 [part,tpart]=PartitioningVector(md,grids);
    109 
    110107end %end function

  • issm/trunk/src/m/solutions/ice/ModelProcessorThermal.m

    r1651 r1680  
    1 function [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorThermal(md,solutiontype);
     1function [elements,grids,loads,constraints,materials]=ModelProcessorThermal(md,solutiontype);
    22%MODELPROCESSORTHERMAL - process model for a thermal solution
    33%
    … …  
    99%
    1010%   Usage:
    11 %      [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorThermal(md,solutiontype)
     11%      [elements,grids,loads,constraints,materials]=ModelProcessorThermal(md,solutiontype)
    1212
    1313%Allocate grids and elements
    … …  
    135135end
    136136
    137 
    138 %Last thing, return a partitioning vector, and its transpose.
    139 [part,tpart]=PartitioningVector(md,grids);
    140 
    141 
    142137end %end function

  • issm/trunk/src/m/solutions/ice/huttercompute.m

    r34 r1680  
    1717%First, build elements,grids,loads, etc ... for horizontal, base vertical and vertical model
    1818disp('   processing model');
    19 [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessor(md,'diagnostic_hutter');
     19[elements,grids,loads,constraints,materials]=ModelProcessor(md,'diagnostic_hutter');
    2020
    2121%generate degrees of freedom

  • issm/trunk/src/m/solutions/ice/prognostic.m

    r914 r1680  
    5959%project collapsed thickness onto 3d mesh
    6060if ~isstruct(md.results), md.results=struct(); end
    61 indx=1:6:m.gridset.gsize; indx=indx(m.tpart);
     61indx=1:6:m.gridset.gsize;
    6262md.results.prognostic.step=1;
    6363md.results.prognostic.time=0;

  • issm/trunk/src/m/solutions/ice/thermal.m

    r1653 r1680  
    2121%initialize velocity,pressure and material properties
    2222velocity=zeros(m_t.gridset.gsize,1);
    23 velocity(1:6:m_t.gridset.gsize)=md.vx(m_t.part)/md.yts;
    24 velocity(2:6:m_t.gridset.gsize)=md.vy(m_t.part)/md.yts;
    25 velocity(3:6:m_t.gridset.gsize)=md.vz(m_t.part)/md.yts;
     23velocity(1:6:m_t.gridset.gsize)=md.vx/md.yts;
     24velocity(2:6:m_t.gridset.gsize)=md.vy/md.yts;
     25velocity(3:6:m_t.gridset.gsize)=md.vz/md.yts;
    2626
    2727pressure=zeros(m_t.gridset.gsize,1);
    … …  
    4444        %Wrap up
    4545        indx=1:6:gridset.gsize;
    46         indx=indx(m_t.tpart);
    4746        if ~isstruct(md.results), md.results=struct(); end
    4847        md.results.thermal.step=1;
    … …  
    8483        %Wrap up
    8584        indx=1:6:m_t.gridset.gsize;
    86         indx=indx(m_t.tpart);
    8785        solution=struct('time',{},'temperature',{},'melting',{});
    8886

  • issm/trunk/src/m/solutions/ice/transient2d.m

    r914 r1680  
    8080        %update surface and bed using the new thickness
    8181        disp(sprintf('%s','   updating geometry...'));
    82         indx=1:6:m_p.gridset.gsize; indx=indx(m_p.tpart);
     82        indx=1:6:m_p.gridset.gsize;
    8383        [new_bed,new_surface,new_thickness]=UpdateGeometry(md,new_thickness(indx),solution(n).bed(indx),solution(n).surface(indx));
    8484       
    … …  
    102102
    103103%load results onto model
    104 indx=1:6:m_p.gridset.gsize; indx=indx(m_p.tpart);
    105 indy=2:6:m_p.gridset.gsize; indy=indy(m_p.tpart);
     104indx=1:6:m_p.gridset.gsize;
     105indy=2:6:m_p.gridset.gsize;
    106106for i=1:length(solution),
    107107        solution2(i).vx=solution(i).u_g(indx)*md.yts;

  • issm/trunk/src/m/solutions/ice/transient3d.m

    r1067 r1680  
    112112
    113113        %project collapsed thickness onto 3d mesh
    114         indx=1:6:fem.m_p.gridset.gsize; indx=indx(fem.m_p.tpart);
     114        indx=1:6:fem.m_p.gridset.gsize;
    115115        new_thickness=project3d(md,project2d(md,new_thickness(indx),1),'node');
    116116
    … …  
    156156
    157157%load results onto model
    158 indx=1:6:fem.m_dv.gridset.gsize; indx=indx(fem.m_dv.tpart);
    159 indy=2:6:fem.m_dv.gridset.gsize; indy=indy(fem.m_dv.tpart);
    160 indz=3:6:fem.m_dv.gridset.gsize; indz=indz(fem.m_dv.tpart);
     158indx=1:6:fem.m_dv.gridset.gsize;
     159indy=2:6:fem.m_dv.gridset.gsize;
     160indz=3:6:fem.m_dv.gridset.gsize;
    161161for i=1:length(solution),
    162162        solution2(i).vx=solution(i).u_g(indx)*md.yts;
Note: See TracChangeset for help on using the changeset viewer.