From 6f1911307258dca7bbf75397a77219dce54924fd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 21 Jul 2021 06:19:04 +0200 Subject: [PATCH 1/2] L, P, F, etc. are second order tensors --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) 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 From 2fff1914218a8559c34bd11183f1b39ca5d706f3 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 21 Jul 2021 14:56:53 +0200 Subject: [PATCH 2/2] [skip ci] updated version information after successful test of v3.0.0-alpha4-117-g9f2c37761 --- python/damask/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/damask/VERSION b/python/damask/VERSION index 7c2b718dc..0bdc68340 100644 --- a/python/damask/VERSION +++ b/python/damask/VERSION @@ -1 +1 @@ -v3.0.0-alpha4-114-gb98819a36 +v3.0.0-alpha4-117-g9f2c37761