diff --git a/src/homogenization.f90 b/src/homogenization.f90 index f4f701d7c..57b3dae4b 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -270,7 +270,7 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE call mechanical_partition(homogenization_F(1:3,1:3,ce),ce) converged = .true. 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 if (converged) then @@ -318,7 +318,7 @@ subroutine materialpoint_stressAndItsTangent3(dt,FEsolving_execIP,FEsolving_exec call thermal_partition(ce) do co = 1, homogenization_Nconstituents(ho) 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... print*, ' Integration point ', ip,' at element ', el, ' terminally ill' terminallyIll = .true. ! ...and kills all others diff --git a/src/phase.f90 b/src/phase.f90 index e396e5661..a96145995 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -209,13 +209,13 @@ module phase ! == 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 integer, intent(in) :: ph, en logical :: converged_ - end function thermal_stress + end function phase_thermal_constitutive module function integrateDamageState(dt,co,ce) result(broken) real(pReal), intent(in) :: dt @@ -225,11 +225,11 @@ module phase logical :: broken 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 integer, intent(in) :: co, ip, el logical :: converged_ - end function crystallite_stress + end function phase_mechanical_constitutive !ToDo: Try to merge the all stiffness functions module function phase_homogenizedC(ph,en) result(C) @@ -315,8 +315,8 @@ module phase plastic_nonlocal_updateCompatibility, & converged, & crystallite_init, & - crystallite_stress, & - thermal_stress, & + phase_mechanical_constitutive, & + phase_thermal_constitutive, & phase_mechanical_dPdF, & crystallite_orientations, & crystallite_push33ToRef, & diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 7562c055f..c176de069 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -977,7 +977,7 @@ end subroutine mechanical_forward !-------------------------------------------------------------------------------------------------- !> @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 integer, intent(in) :: & @@ -1071,7 +1071,7 @@ module function crystallite_stress(dt,co,ip,el) result(converged_) enddo cutbackLooping -end function crystallite_stress +end function phase_mechanical_constitutive !-------------------------------------------------------------------------------------------------- diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 8d2915ef7..895246dfa 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -216,7 +216,7 @@ module function phase_K_T(co,ce) result(K) 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 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) -end function thermal_stress +end function phase_thermal_constitutive !--------------------------------------------------------------------------------------------------