diff --git a/PRIVATE b/PRIVATE index a949f5417..174ecac2d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit a949f5417762bddc551bf99f19a26ea2bdb4e5b4 +Subproject commit 174ecac2d3ab7596bdb60184d6bb9e1a52cb7378 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index e98b2d818..9c31b6f26 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -482,20 +482,13 @@ subroutine getMaskedTensor(values,mask,tensor) values = 0.0 - if (tensor%length == 9) then ! temporary support for deprecated 1D tensor - do i = 1,9 - mask((i-1)/3+1,mod(i-1,3)+1) = tensor%get_asString(i) /= 'x' - if (mask((i-1)/3+1,mod(i-1,3)+1)) values((i-1)/3+1,mod(i-1,3)+1) = tensor%get_asFloat(i) + do i = 1,3 + row => tensor%get(i) + do j = 1,3 + mask(i,j) = row%get_asString(j) /= 'x' + if (mask(i,j)) values(i,j) = row%get_asFloat(j) enddo - else - do i = 1,3 - row => tensor%get(i) - do j = 1,3 - mask(i,j) = row%get_asString(j) /= 'x' ! ToDo change to np.masked behavior - if (mask(i,j)) values(i,j) = row%get_asFloat(j) - enddo - enddo - endif + enddo end subroutine