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

Merge remote-tracking branch 'origin/development' into 289-consistent-name-for-base-datatypes-in-fortran

This commit is contained in:
Martin Diehl 2023-06-05 15:02:50 +02:00
parent 0324e7ece1 fd55fe2b9f
commit 11530c19bb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 22a23a9d5939d49d9d277c7066d9b68003a33324 Subproject commit 4cd6c7350b0a9d4ad3efcb5fe6c6cfffa99c426f

2
VERSION
View File

@ -1 +1 @@
3.0.0-alpha7-534-g51210a05e 3.0.0-alpha7-537-g1eee3d3ee

2
src/phase_damage.f90
View File

@ -210,7 +210,7 @@ module function phase_f_phi(phi,co,ce) result(f)
select case(phase_damage(ph)) select case(phase_damage(ph))
case(DAMAGE_ISOBRITTLE_ID,DAMAGE_ANISOBRITTLE_ID) case(DAMAGE_ISOBRITTLE_ID,DAMAGE_ANISOBRITTLE_ID)
f = 1.0_pREAL & f = 1.0_pREAL &
- phi*damageState(ph)%state(1,en) - 2.0_pREAL * phi*damageState(ph)%state(1,en)
case default case default
f = 0.0_pREAL f = 0.0_pREAL
end select end select