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

polishing

This commit is contained in:
Martin Diehl 2020-03-29 20:07:09 +02:00
parent 2a37acfe5e
commit 9c90aa5acb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/tests/test_Geom.py
View File

@ -28,7 +28,7 @@ def reference_dir(reference_dir_base):
class TestGeom: class TestGeom:
def test_update(self,default): def test_update(self,default):
modified = copy.deepcopy(default) modified = copy.deepcopy(default)
modified.update( modified.update(

14
src/constitutive_plastic_nonlocal.f90
View File

@ -16,15 +16,15 @@ submodule(constitutive) plastic_nonlocal
kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin
! storage order of dislocation types ! storage order of dislocation types
integer, dimension(8), parameter :: & integer, dimension(*), parameter :: &
sgl = [1,2,3,4,5,6,7,8] !< signed (single) sgl = [1,2,3,4,5,6,7,8] !< signed (single)
integer, dimension(5), parameter :: & integer, dimension(*), parameter :: &
edg = [1,2,5,6,9], & !< edge edg = [1,2,5,6,9], & !< edge
scr = [3,4,7,8,10] !< screw scr = [3,4,7,8,10] !< screw
integer, dimension(4), parameter :: & integer, dimension(*), parameter :: &
mob = [1,2,3,4], & !< mobile mob = [1,2,3,4], & !< mobile
imm = [5,6,7,8] !< immobile (blocked) imm = [5,6,7,8] !< immobile (blocked)
integer, dimension(2), parameter :: & integer, dimension(*), parameter :: &
dip = [9,10], & !< dipole dip = [9,10], & !< dipole
imm_edg = imm(1:2), & !< immobile edge imm_edg = imm(1:2), & !< immobile edge
imm_scr = imm(3:4) !< immobile screw imm_scr = imm(3:4) !< immobile screw
@ -1611,7 +1611,7 @@ end subroutine stateInit
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief calculates kinetics !> @brief calculates kinetics
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine kinetics(v, dv_dtau, dv_dtauNS, tau, tauNS, tauThreshold, c, Temperature, instance) pure subroutine kinetics(v, dv_dtau, dv_dtauNS, tau, tauNS, tauThreshold, c, Temperature, instance)
integer, intent(in) :: & integer, intent(in) :: &
c, & !< dislocation character (1:edge, 2:screw) c, & !< dislocation character (1:edge, 2:screw)
@ -1726,7 +1726,7 @@ end subroutine kinetics
!> @brief returns copy of current dislocation densities from state !> @brief returns copy of current dislocation densities from state
!> @details raw values is rectified !> @details raw values is rectified
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function getRho(instance,of,ip,el) pure function getRho(instance,of,ip,el)
integer, intent(in) :: instance, of,ip,el integer, intent(in) :: instance, of,ip,el
real(pReal), dimension(param(instance)%sum_N_sl,10) :: getRho real(pReal), dimension(param(instance)%sum_N_sl,10) :: getRho
@ -1751,7 +1751,7 @@ end function getRho
!> @brief returns copy of current dislocation densities from state !> @brief returns copy of current dislocation densities from state
!> @details raw values is rectified !> @details raw values is rectified
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function getRho0(instance,of,ip,el) pure function getRho0(instance,of,ip,el)
integer, intent(in) :: instance, of,ip,el integer, intent(in) :: instance, of,ip,el
real(pReal), dimension(param(instance)%sum_N_sl,10) :: getRho0 real(pReal), dimension(param(instance)%sum_N_sl,10) :: getRho0