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

no need for type conversion

This commit is contained in:
Martin Diehl 2021-08-18 22:18:08 +02:00
parent 49ccbf3eb8
commit ab5f0d1bcd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DAMASK_prerequisites.sh
View File

@ -74,7 +74,7 @@ echo PETSC_ARCH: $PETSC_ARCH
echo PETSC_DIR: $PETSC_DIR echo PETSC_DIR: $PETSC_DIR
echo echo
echo $PETSC_DIR/$PETSC_ARCH/lib: echo $PETSC_DIR/$PETSC_ARCH/lib:
/s $PETSC_DIR/$PETSC_ARCH/lib ls $PETSC_DIR/$PETSC_ARCH/lib
echo echo
echo $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables: echo $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables:
cat $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables cat $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables

10
python/damask/mechanics.py
View File

@ -257,18 +257,18 @@ def _polar_decomposition(T,requested):
u, _, vh = _np.linalg.svd(T) u, _, vh = _np.linalg.svd(T)
R = _np.einsum('...ij,...jk',u,vh) R = _np.einsum('...ij,...jk',u,vh)
output = [] output = ()
if 'R' in requested: if 'R' in requested:
output.append(R) output+=(R,)
if 'V' in requested: if 'V' in requested:
output.append(_np.einsum('...ij,...kj',T,R)) output+=(_np.einsum('...ij,...kj',T,R),)
if 'U' in requested: if 'U' in requested:
output.append(_np.einsum('...ji,...jk',R,T)) output+=(_np.einsum('...ji,...jk',R,T),)
if len(output) == 0: if len(output) == 0:
raise ValueError('output needs to be out of V, R, U') raise ValueError('output needs to be out of V, R, U')
return tuple(output) return output
def _equivalent_Mises(T_sym,s): def _equivalent_Mises(T_sym,s):