slightly more picky in what exceptions to catch, now complain when losing all labels

VERSION

@@ -1 +1 @@
-v2.0.2-580-gc1c7283e
+v2.0.2-582-g0710609c

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

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:

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

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