223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into more-flexible-L

This commit is contained in:
Martin Diehl 2021-07-22 00:20:33 +02:00
parent 9d349f8a7c 2fff191421
commit 574cfd7034
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit a949f5417762bddc551bf99f19a26ea2bdb4e5b4
Subproject commit 174ecac2d3ab7596bdb60184d6bb9e1a52cb7378

2
python/damask/VERSION
View File

@ -1 +1 @@
v3.0.0-alpha4-114-gb98819a36
v3.0.0-alpha4-117-g9f2c37761

19
src/grid/DAMASK_grid.f90
View File

@ -475,20 +475,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 (.not. 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 (.not. 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'
if (.not. mask(i,j)) values(i,j) = row%get_asFloat(j)
enddo
enddo
endif
enddo
end subroutine