Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

code/plastic_phenopowerlaw.f90

@@ -1160,9 +1160,9 @@ function plastic_phenopowerlaw_postResults(Tstar_v,ipc,ip,el)
            enddo
            plastic_phenopowerlaw_postResults(c+j) = plastic_phenopowerlaw_gdot0_slip(instance)*0.5_pReal* &
                     ((abs(tau_slip_pos)/plasticState(ph)%state(j,of))**plastic_phenopowerlaw_n_slip(instance) &
-                    +(abs(tau_slip_neg)/plasticState(ph)%state(j,of))**plastic_phenopowerlaw_n_slip(instance))&
-                    *sign(1.0_pReal,tau_slip_pos)
-
+                    *sign(1.0_pReal,tau_slip_pos) &
+                    +(abs(tau_slip_neg)/(plasticState(ph)%state(j,of)))**plastic_phenopowerlaw_n_slip(instance) &
+                    *sign(1.0_pReal,tau_slip_neg))
          enddo slipSystems1
        enddo slipFamilies1
        c = c + nSlip

processing/post/postResults.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 no BOM -*-
 
-import os,sys,math,re,time,struct,string
+import os,sys,math,re,time,struct
 import damask
 from optparse import OptionParser, OptionGroup
 
@@ -1060,8 +1060,7 @@ for incCount,position in enumerate(locations):     # walk through locations
     file = open(outFilename,'w')
     fileOpen = True
     file.write('2\theader\n')
-    file.write(string.replace('$Id$','\n','\\n')+
-               '\t' + ' '.join(sys.argv[1:]) + '\n')
+    file.write(scriptID + '\t' + ' '.join(sys.argv[1:]))
     headerWritten = False
 
   file.flush()