Changeset 9694


Ignore:
Timestamp:
09/08/11 14:56:34 (14 years ago)
Author:
seroussi
Message:

minor some fix in extract

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/model/modelextract.m

    r9679 r9694  
    188188
    189189        %Penalties
    190         if ~isnan(md2.penalties),
    191                 for i=1:size(md1.penalties,1);
    192                         md2.penalties(i,:)=Pnode(md1.penalties(i,:));
    193                 end
    194                 md2.penalties=md2.penalties(find(md2.penalties(:,1)),:);
     190        if ~isnan(md2.diagnostic.vertex_pairing),
     191                for i=1:size(md1.diagnostic.vertex_pairing,1);
     192                        md2.diagnostic.vertex_pairing(i,:)=Pnode(md1.diagnostic.vertex_pairing(i,:));
     193                end
     194                md2.diagnostic.vertex_pairing=md2.diagnostic.vertex_pairing(find(md2.diagnostic.vertex_pairing(:,1)),:);
    195195        end
    196196        if ~isnan(md2.prognostic.vertex_pairing),
     
    217217        nodestoflag2=Pnode(nodestoflag1);
    218218        if numel(md1.diagnostic.spcvx)>1 & numel(md1.diagnostic.spcvy)>2 & numel(md1.diagnostic.spcvz)>2,
    219                 if numel(md1.vx_obs)>1 & numel(md1.vy_obs)>1
    220                         md2.diagnostic.spcvx(nodestoflag2)=md2.vx_obs(nodestoflag2);
    221                         md2.diagnostic.spcvy(nodestoflag2)=md2.vy_obs(nodestoflag2);
     219                if numel(md1.inversion.vx_obs)>1 & numel(md1.inversion.vy_obs)>1
     220                        md2.diagnostic.spcvx(nodestoflag2)=md2.inversion.vx_obs(nodestoflag2);
     221                        md2.diagnostic.spcvy(nodestoflag2)=md2.inversion.vy_obs(nodestoflag2);
    222222                else
    223223                        md2.diagnostic.spcvx(nodestoflag2)=NaN;
     
    235235
    236236        %Diagnostic
    237         if ~isnan(md2.pressureload)
    238                 md2.pressureload(:,1)=Pnode(md1.pressureload(:,1));
    239                 md2.pressureload(:,2)=Pnode(md1.pressureload(:,2));
    240                 md2.pressureload(:,end-1)=Pelem(md1.pressureload(:,end-1));
     237        if ~isnan(md2.diagnostic.icefront)
     238                md2.diagnostic.icefront(:,1)=Pnode(md1.diagnostic.icefront(:,1));
     239                md2.diagnostic.icefront(:,2)=Pnode(md1.diagnostic.icefront(:,2));
     240                md2.diagnostic.icefront(:,end-1)=Pelem(md1.diagnostic.icefront(:,end-1));
    241241                if md1.dim==3
    242                         md2.pressureload(:,3)=Pnode(md1.pressureload(:,3));
    243                         md2.pressureload(:,4)=Pnode(md1.pressureload(:,4));
    244                 end
    245                 md2.pressureload=md2.pressureload(find(md2.pressureload(:,1) & md2.pressureload(:,2) & md2.pressureload(:,end)),:);
     242                        md2.diagnostic.icefront(:,3)=Pnode(md1.diagnostic.icefront(:,3));
     243                        md2.diagnostic.icefront(:,4)=Pnode(md1.diagnostic.icefront(:,4));
     244                end
     245                md2.diagnostic.icefront=md2.diagnostic.icefront(find(md2.diagnostic.icefront(:,1) & md2.diagnostic.icefront(:,2) & md2.diagnostic.icefront(:,end)),:);
    246246        end
    247247
Note: See TracChangeset for help on using the changeset viewer.