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

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

This commit is contained in:
Martin Diehl 2016-07-18 19:36:47 +02:00
parent cd63a92733 0a2d5e4c2a
commit 03bb0b8a98
3 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v2.0.0-350-g7d84b99 v2.0.0-385-g1b30b18

6
code/plastic_phenopowerlaw.f90
View File

@ -1160,9 +1160,9 @@ function plastic_phenopowerlaw_postResults(Tstar_v,ipc,ip,el)
enddo enddo
plastic_phenopowerlaw_postResults(c+j) = plastic_phenopowerlaw_gdot0_slip(instance)*0.5_pReal* & 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_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 slipSystems1
enddo slipFamilies1 enddo slipFamilies1
c = c + nSlip c = c + nSlip

2
processing/post/postResults.py
View File

@ -1060,7 +1060,7 @@ for incCount,position in enumerate(locations): # walk through locations
file = open(outFilename,'w') file = open(outFilename,'w')
fileOpen = True fileOpen = True
file.write('2\theader\n') file.write('2\theader\n')
file.write(scriptID + '\t' + ' '.join(sys.argv[1:])) file.write(scriptID + '\t' + ' '.join(sys.argv[1:]) + '\n')
headerWritten = False headerWritten = False
file.flush() file.flush()