diff --git a/VERSION b/VERSION index 8e8aa762e..551bf8f07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-580-gc1c7283e +v2.0.2-582-g0710609c diff --git a/installation/patch/python2to3.sh b/installation/patch/python2to3.sh index 1d86b0ce7..07eed0e1e 100755 --- a/installation/patch/python2to3.sh +++ b/installation/patch/python2to3.sh @@ -1,8 +1,8 @@ #! /usr/bin/env bash if [ $1x != 3to2x ]; then echo 'python2.7 to python' - find . -name '*.py' | xargs sed -i 's/usr\/bin\/env python2.7/usr\/bin\/env python/g' + find . -name '*.py' -type f | xargs sed -i 's/usr\/bin\/env python2.7/usr\/bin\/env python/g' else echo 'python to python2.7' - find . -name '*.py' | xargs sed -i 's/usr\/bin\/env python/usr\/bin\/env python2.7/g' + find . -name '*.py' -type f | xargs sed -i 's/usr\/bin\/env python/usr\/bin\/env python2.7/g' fi diff --git a/lib/damask/asciitable.py b/lib/damask/asciitable.py index 927f7e106..839adb944 100644 --- a/lib/damask/asciitable.py +++ b/lib/damask/asciitable.py @@ -69,7 +69,7 @@ class ASCIItable(): # ------------------------------------------------------------------ def _removeCRLF(self, string): - """delete any carriage return and line feed from string""" + """Delete any carriage return and line feed from string""" try: return string.replace('\n','').replace('\r','') except AttributeError: diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index 92ea5301d..1d7bc6f86 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -942,10 +942,10 @@ pure function homogenization_RGC_postResults(ip,el,avgP,avgF) do o = 1_pInt,homogenization_Noutput(mesh_element(3,el)) select case(homogenization_RGC_outputID(o,homID)) case (avgdefgrad_ID) - homogenization_RGC_postResults(c+1_pInt:c+9_pInt) = reshape(avgF,[9]) + homogenization_RGC_postResults(c+1_pInt:c+9_pInt) = reshape(transpose(avgF),[9]) c = c + 9_pInt case (avgfirstpiola_ID) - homogenization_RGC_postResults(c+1_pInt:c+9_pInt) = reshape(avgP,[9]) + homogenization_RGC_postResults(c+1_pInt:c+9_pInt) = reshape(transpose(avgP),[9]) c = c + 9_pInt case (ipcoords_ID) homogenization_RGC_postResults(c+1_pInt:c+3_pInt) = mesh_ipCoordinates(1:3,ip,el) ! current ip coordinates diff --git a/src/homogenization_isostrain.f90 b/src/homogenization_isostrain.f90 index 8ee0df73d..24aedf75f 100644 --- a/src/homogenization_isostrain.f90 +++ b/src/homogenization_isostrain.f90 @@ -300,10 +300,10 @@ pure function homogenization_isostrain_postResults(ip,el,avgP,avgF) homogenization_isostrain_postResults(c+1_pInt) = real(homogenization_isostrain_Ngrains(homID),pReal) c = c + 1_pInt case (avgdefgrad_ID) - homogenization_isostrain_postResults(c+1_pInt:c+9_pInt) = reshape(avgF,[9]) + homogenization_isostrain_postResults(c+1_pInt:c+9_pInt) = reshape(transpose(avgF),[9]) c = c + 9_pInt case (avgfirstpiola_ID) - homogenization_isostrain_postResults(c+1_pInt:c+9_pInt) = reshape(avgP,[9]) + homogenization_isostrain_postResults(c+1_pInt:c+9_pInt) = reshape(transpose(avgP),[9]) c = c + 9_pInt case (ipcoords_ID) homogenization_isostrain_postResults(c+1_pInt:c+3_pInt) = mesh_ipCoordinates(1:3,ip,el) ! current ip coordinates