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

consistent names

This commit is contained in:
Martin Diehl 2020-02-11 17:36:43 +01:00
parent c2c84d698f
commit 6463fcdabd
8 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/constitutive.f90
View File

@ -313,7 +313,7 @@ module constitutive
plastic_nonlocal_updateCompatibility, &
constitutive_init, &
constitutive_homogenizedC, &
constitutive_microstructure, &
constitutive_dependentState, &
constitutive_LpAndItsTangents, &
constitutive_LiAndItsTangents, &
constitutive_initialFi, &
@ -412,7 +412,7 @@ end function constitutive_homogenizedC
!--------------------------------------------------------------------------------------------------
!> @brief calls microstructure function of the different constitutive models
!--------------------------------------------------------------------------------------------------
subroutine constitutive_microstructure(F, Fp, ipc, ip, el)
subroutine constitutive_dependentState(F, Fp, ipc, ip, el)
integer, intent(in) :: &
ipc, & !< component-ID of integration point
@ -442,7 +442,7 @@ subroutine constitutive_microstructure(F, Fp, ipc, ip, el)
call plastic_nonlocal_dependentState (F,Fp,ip,el)
end select plasticityType
end subroutine constitutive_microstructure
end subroutine constitutive_dependentState
!--------------------------------------------------------------------------------------------------

1
src/constitutive_plastic_disloUCLA.f90
View File

@ -290,7 +290,6 @@ module subroutine plastic_disloUCLA_init
plasticState(p)%aTolState(startIndex:endIndex) = 1.0e6_pReal ! Don't use for convergence check
! global alias
plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:)
plasticState(p)%accumulatedSlip => plasticState(p)%state(startIndex:endIndex,:)
allocate(dst%Lambda_sl(prm%sum_N_sl,NipcMyPhase), source=0.0_pReal)
allocate(dst%threshold_stress(prm%sum_N_sl,NipcMyPhase), source=0.0_pReal)

1
src/constitutive_plastic_dislotwin.f90
View File

@ -511,7 +511,6 @@ module subroutine plastic_dislotwin_init
plasticState(p)%aTolState(startIndex:endIndex) = 1.0e6_pReal !ToDo: better make optional parameter
! global alias
plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:)
plasticState(p)%accumulatedSlip => plasticState(p)%state(startIndex:endIndex,:)
startIndex = endIndex + 1
endIndex = endIndex + prm%sum_N_tw

1
src/constitutive_plastic_isotropic.f90
View File

@ -175,7 +175,6 @@ module subroutine plastic_isotropic_init
plasticState(p)%aTolState(2) = prm%aTol_gamma
! global alias
plasticState(p)%slipRate => plasticState(p)%dotState(2:2,:)
plasticState(p)%accumulatedSlip => plasticState(p)%state (2:2,:)
plasticState(p)%state0 = plasticState(p)%state ! ToDo: this could be done centrally

1
src/constitutive_plastic_kinehardening.f90
View File

@ -250,7 +250,6 @@ module subroutine plastic_kinehardening_init
plasticState(p)%aTolState(startIndex:endIndex) = prm%aTolShear
! global alias
plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:)
plasticState(p)%accumulatedSlip => plasticState(p)%state(startIndex:endIndex,:)
o = plasticState(p)%offsetDeltaState
startIndex = endIndex + 1

1
src/constitutive_plastic_nonlocal.f90
View File

@ -552,7 +552,6 @@ module subroutine plastic_nonlocal_init
del%gamma => plasticState(p)%deltaState (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase)
plasticState(p)%aTolState(10*prm%totalNslip + 1:11*prm%totalNslip ) = prm%aTolShear
plasticState(p)%slipRate => plasticState(p)%dotState (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase)
plasticState(p)%accumulatedSlip => plasticState(p)%state(10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase)
stt%rho_forest => plasticState(p)%state (11*prm%totalNslip + 1:12*prm%totalNslip ,1:NofMyPhase)
stt%v => plasticState(p)%state (12*prm%totalNslip + 1:16*prm%totalNslip ,1:NofMyPhase)

1
src/constitutive_plastic_phenopowerlaw.f90
View File

@ -311,7 +311,6 @@ module subroutine plastic_phenopowerlaw_init
plasticState(p)%aTolState(startIndex:endIndex) = prm%aTolShear
! global alias
plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:)
plasticState(p)%accumulatedSlip => plasticState(p)%state(startIndex:endIndex,:)
startIndex = endIndex + 1
endIndex = endIndex + prm%totalNtwin

5
src/crystallite.f90
View File

@ -264,7 +264,7 @@ subroutine crystallite_init
do e = FEsolving_execElem(1),FEsolving_execElem(2)
do i = FEsolving_execIP(1),FEsolving_execIP(2)
do c = 1,homogenization_Ngrains(material_homogenizationAt(e))
call constitutive_microstructure(crystallite_partionedF0(1:3,1:3,c,i,e), &
call constitutive_dependentState(crystallite_partionedF0(1:3,1:3,c,i,e), &
crystallite_partionedFp0(1:3,1:3,c,i,e), &
c,i,e) ! update dependent state variables to be consistent with basic states
enddo
@ -1874,9 +1874,6 @@ end subroutine update_stress
!> @brief tbd
!--------------------------------------------------------------------------------------------------
subroutine update_dependentState
use constitutive, only: &
constitutive_dependentState => constitutive_microstructure
integer :: e, & ! element index in element loop
i, & ! integration point index in ip loop
g ! grain index in grain loop