[24307] | 1 | Index: ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.py (revision 24178)
|
---|
| 4 | +++ ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.py (revision 24179)
|
---|
| 5 | @@ -31,16 +31,16 @@
|
---|
| 6 |
|
---|
| 7 | #finally, project vector:
|
---|
| 8 | vector = project2d(md3d,vector,layer)
|
---|
| 9 | - md.qmu.partition = project2d(md3d,md3d.qmu.partition,layer)
|
---|
| 10 | + md.qmu.vpartition = project2d(md3d,md3d.qmu.vpartition,layer)
|
---|
| 11 |
|
---|
| 12 |
|
---|
| 13 | #ok, first check that part is Matlab indexed
|
---|
| 14 | - part = (md.qmu.partition).copy()
|
---|
| 15 | + part = (md.qmu.vpartition).copy()
|
---|
| 16 | part = part.flatten() + 1
|
---|
| 17 |
|
---|
| 18 | #some check:
|
---|
| 19 | if md.qmu.numberofpartitions != max(part):
|
---|
| 20 | - raise RuntimeError('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.partition)')
|
---|
| 21 | + raise RuntimeError('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.vpartition)')
|
---|
| 22 |
|
---|
| 23 |
|
---|
| 24 | #initialize output
|
---|
| 25 | Index: ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.m
|
---|
| 26 | ===================================================================
|
---|
| 27 | --- ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.m (revision 24178)
|
---|
| 28 | +++ ../trunk-jpl/src/m/partition/AreaAverageOntoPartition.m (revision 24179)
|
---|
| 29 | @@ -28,15 +28,15 @@
|
---|
| 30 |
|
---|
| 31 | %finally, project vector:
|
---|
| 32 | vector=project2d(md3d,vector,layer);
|
---|
| 33 | - md.qmu.partition=project2d(md3d,md3d.qmu.partition,layer);
|
---|
| 34 | + md.qmu.vpartition=project2d(md3d,md3d.qmu.vpartition,layer);
|
---|
| 35 | end
|
---|
| 36 |
|
---|
| 37 | %ok, first check that part is Matlab indexed
|
---|
| 38 | -part=md.qmu.partition+1;
|
---|
| 39 | +part=md.qmu.vpartition+1;
|
---|
| 40 |
|
---|
| 41 | %some check:
|
---|
| 42 | if md.qmu.numberofpartitions~=max(part),
|
---|
| 43 | - error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.partition)');
|
---|
| 44 | + error('AreaAverageOntoPartition error message: ''npart'' should be equal to max(md.qmu.vpartition)');
|
---|
| 45 | end
|
---|
| 46 |
|
---|
| 47 | %initialize output
|
---|