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

make similarity of state/param structure clear

This commit is contained in:
Martin Diehl 2019-01-13 17:03:49 +01:00
parent 808ac2c739
commit aaea11d96b
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plastic_disloUCLA.f90
View File

@ -81,7 +81,7 @@ module plastic_disloUCLA
rhoEdge, &
rhoEdgeDip, &
accshear
end type
end type tDisloUCLAState
type, private :: tDisloUCLAdependentState
real(pReal), allocatable, dimension(:,:) :: &
@ -90,13 +90,13 @@ module plastic_disloUCLA
threshold_stress
end type tDisloUCLAdependentState
type(tParameters), dimension(:), allocatable, private :: param !< containers of constitutive parameters (len Ninstance)
type(tDisloUCLAState ), allocatable, dimension(:), private :: &
!--------------------------------------------------------------------------------------------------
! containers for parameters and state
type(tParameters), allocatable, dimension(:), private :: param
type(tDisloUCLAState ), allocatable, dimension(:), private :: &
dotState, &
state
type(tDisloUCLAdependentState), allocatable, dimension(:), private :: &
dependentState
type(tDisloUCLAdependentState), allocatable, dimension(:), private :: dependentState
public :: &
plastic_disloUCLA_init, &

9
src/plastic_isotropic.f90
View File

@ -48,16 +48,17 @@ module plastic_isotropic
outputID
logical :: &
dilatation
end type
end type tParameters
type, private :: tIsotropicState
real(pReal), pointer, dimension(:) :: &
flowstress, &
accumulatedShear
end type
end type tIsotropicState
type(tParameters), dimension(:), allocatable, private :: param !< containers of constitutive parameters (len Ninstance)
!--------------------------------------------------------------------------------------------------
! containers for parameters and state
type(tParameters), allocatable, dimension(:), private :: param
type(tIsotropicState), allocatable, dimension(:), private :: &
dotState, &
state

9
src/plastic_kinematichardening.f90
View File

@ -58,7 +58,7 @@ module plastic_kinehardening
Nslip !< number of active slip systems for each family
integer(kind(undefined_ID)), allocatable, dimension(:) :: &
outputID !< ID of each post result output
end type
end type tParameters
type, private :: tKinehardeningState
real(pReal), pointer, dimension(:,:) :: & !< vectors along NipcMyInstance
@ -68,10 +68,11 @@ module plastic_kinehardening
chi0, & !< backstress at last switch of stress sense
gamma0, & !< accumulated shear at last switch of stress sense
accshear !< accumulated (absolute) shear
end type
end type tKinehardeningState
type(tParameters), dimension(:), allocatable, private :: param !< containers of constitutive parameters (len Ninstance)
!--------------------------------------------------------------------------------------------------
! containers for parameters and state
type(tParameters), allocatable, dimension(:), private :: param
type(tKinehardeningState), allocatable, dimension(:), private :: &
dotState, &
deltaState, &

9
src/plastic_phenopowerlaw.f90
View File

@ -72,7 +72,7 @@ module plastic_phenopowerlaw
Ntwin !< number of active twin systems for each family
integer(kind(undefined_ID)), allocatable, dimension(:) :: &
outputID !< ID of each post result output
end type !< container type for internal constitutive parameters
end type tParameters
type, private :: tPhenopowerlawState
real(pReal), pointer, dimension(:,:) :: &
@ -80,10 +80,11 @@ module plastic_phenopowerlaw
xi_twin, &
gamma_slip, &
gamma_twin
end type
end type tPhenopowerlawState
type(tParameters), dimension(:), allocatable, private :: param !< containers of constitutive parameters (len Ninstance)
!--------------------------------------------------------------------------------------------------
! containers for parameters and state
type(tParameters), allocatable, dimension(:), private :: param
type(tPhenopowerlawState), allocatable, dimension(:), private :: &
dotState, &
state