Changeset 25004


Ignore:
Timestamp:
06/10/20 21:25:19 (5 years ago)
Author:
Eric.Larour
Message:

CHG: switching to partition vectors instead of qmu.vpartition and qmu.epartition

Location:
issm/trunk-jpl/src/m
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m

    r24179 r25004  
    1 function partvector=AreaAverageOntoPartition(md,vector,layer)
     1function partvector=AreaAverageOntoPartition(md,vector,layer,partition)
    22%AREAAVERAGEONTOPARTITION
    33%   compute partition values for a certain vector expressed on the vertices of the mesh.
     
    2929        %finally, project vector:
    3030        vector=project2d(md3d,vector,layer);
    31         md.qmu.vpartition=project2d(md3d,md3d.qmu.vpartition,layer);
     31        partition=project2d(md3d,partition,layer);
    3232end
    3333
    3434%ok, first check that part is Matlab indexed
    35 part=md.qmu.vpartition+1;
     35part=partition+1;
    3636
    3737%some check:
    38 if md.qmu.numberofpartitions~=max(part),
    39         error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.vpartition)');
     38npart=qmupart2npart(partition);
     39if npart~=max(part),
     40        error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(partition)');
    4041end
    4142
  • issm/trunk-jpl/src/m/qmu/importancefactors.m

    r24873 r25004  
    1 function factors=importancefactors(md,variablename,responsename)
     1function factors=importancefactors(md,variablename,responsename,partition)
    22%IMPORTANCEFACTORS - compute importance factors for a certain variable and response.
    33%
     
    4444        factors=importancefactors;
    4545        return;
    46 elseif count==max(md.qmu.epartition+1)
     46elseif count==max(partition+1)
    4747        %distribute importance factor
    48         factors=importancefactors(md.qmu.epartition'+1); %md.qmu.partition was created to index "c" style
     48        factors=importancefactors(partition'+1); %partition was created to index "c" style
    4949else
    5050        %distribute importance factor
    51         factors=importancefactors(md.qmu.vpartition'+1); %md.qmu.partition was created to index "c" style
     51        factors=importancefactors(partition'+1); %partition was created to index "c" style
    5252end
    5353
Note: See TracChangeset for help on using the changeset viewer.