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

more meaningful name

This commit is contained in:
Martin Diehl 2021-07-16 20:50:08 +02:00
parent ed6b1be352
commit 2b24224c7e
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/homogenization.f90
View File

@ -270,7 +270,7 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE
call mechanical_partition(homogenization_F(1:3,1:3,ce),ce) call mechanical_partition(homogenization_F(1:3,1:3,ce),ce)
converged = .true. converged = .true.
do co = 1, homogenization_Nconstituents(ho) do co = 1, homogenization_Nconstituents(ho)
converged = converged .and. crystallite_stress(dt,co,ip,el) converged = converged .and. phase_mechanical_constitutive(dt,co,ip,el)
enddo enddo
if (converged) then if (converged) then
@ -318,7 +318,7 @@ subroutine materialpoint_stressAndItsTangent3(dt,FEsolving_execIP,FEsolving_exec
call thermal_partition(ce) call thermal_partition(ce)
do co = 1, homogenization_Nconstituents(ho) do co = 1, homogenization_Nconstituents(ho)
ph = material_phaseID(co,ce) ph = material_phaseID(co,ce)
if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then if (.not. phase_thermal_constitutive(dt,ph,material_phaseMemberAt(co,ip,el))) then
if (.not. terminallyIll) & ! so first signals terminally ill... if (.not. terminallyIll) & ! so first signals terminally ill...
print*, ' Integration point ', ip,' at element ', el, ' terminally ill' print*, ' Integration point ', ip,' at element ', el, ' terminally ill'
terminallyIll = .true. ! ...and kills all others terminallyIll = .true. ! ...and kills all others

12
src/phase.f90
View File

@ -209,13 +209,13 @@ module phase
! == cleaned:end =================================================================================== ! == cleaned:end ===================================================================================
module function thermal_stress(Delta_t,ph,en) result(converged_) module function phase_thermal_constitutive(Delta_t,ph,en) result(converged_)
real(pReal), intent(in) :: Delta_t real(pReal), intent(in) :: Delta_t
integer, intent(in) :: ph, en integer, intent(in) :: ph, en
logical :: converged_ logical :: converged_
end function thermal_stress end function phase_thermal_constitutive
module function integrateDamageState(dt,co,ce) result(broken) module function integrateDamageState(dt,co,ce) result(broken)
real(pReal), intent(in) :: dt real(pReal), intent(in) :: dt
@ -225,11 +225,11 @@ module phase
logical :: broken logical :: broken
end function integrateDamageState end function integrateDamageState
module function crystallite_stress(dt,co,ip,el) result(converged_) module function phase_mechanical_constitutive(dt,co,ip,el) result(converged_)
real(pReal), intent(in) :: dt real(pReal), intent(in) :: dt
integer, intent(in) :: co, ip, el integer, intent(in) :: co, ip, el
logical :: converged_ logical :: converged_
end function crystallite_stress end function phase_mechanical_constitutive
!ToDo: Try to merge the all stiffness functions !ToDo: Try to merge the all stiffness functions
module function phase_homogenizedC(ph,en) result(C) module function phase_homogenizedC(ph,en) result(C)
@ -315,8 +315,8 @@ module phase
plastic_nonlocal_updateCompatibility, & plastic_nonlocal_updateCompatibility, &
converged, & converged, &
crystallite_init, & crystallite_init, &
crystallite_stress, & phase_mechanical_constitutive, &
thermal_stress, & phase_thermal_constitutive, &
phase_mechanical_dPdF, & phase_mechanical_dPdF, &
crystallite_orientations, & crystallite_orientations, &
crystallite_push33ToRef, & crystallite_push33ToRef, &

4
src/phase_mechanical.f90
View File

@ -977,7 +977,7 @@ end subroutine mechanical_forward
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief calculate stress (P) !> @brief calculate stress (P)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module function crystallite_stress(dt,co,ip,el) result(converged_) module function phase_mechanical_constitutive(dt,co,ip,el) result(converged_)
real(pReal), intent(in) :: dt real(pReal), intent(in) :: dt
integer, intent(in) :: & integer, intent(in) :: &
@ -1071,7 +1071,7 @@ module function crystallite_stress(dt,co,ip,el) result(converged_)
enddo cutbackLooping enddo cutbackLooping
end function crystallite_stress end function phase_mechanical_constitutive
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

4
src/phase_thermal.f90
View File

@ -216,7 +216,7 @@ module function phase_K_T(co,ce) result(K)
end function phase_K_T end function phase_K_T
module function thermal_stress(Delta_t,ph,en) result(converged_) ! ?? why is this called "stress" when it seems closer to "updateState" ?? module function phase_thermal_constitutive(Delta_t,ph,en) result(converged_)
real(pReal), intent(in) :: Delta_t real(pReal), intent(in) :: Delta_t
integer, intent(in) :: ph, en integer, intent(in) :: ph, en
@ -225,7 +225,7 @@ module function thermal_stress(Delta_t,ph,en) result(converged_) ! ??
converged_ = .not. integrateThermalState(Delta_t,ph,en) converged_ = .not. integrateThermalState(Delta_t,ph,en)
end function thermal_stress end function phase_thermal_constitutive
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------