From c53927ad6f71793f4fb5e93247e753731c054f60 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 7 Apr 2021 08:47:46 +0200 Subject: [PATCH] not needed --- src/grid/grid_damage_spectral.f90 | 4 ++-- src/homogenization.f90 | 8 ++++---- src/homogenization_damage.f90 | 15 +++++++-------- src/homogenization_thermal.f90 | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90 index 6f99365f7..24aa4781a 100644 --- a/src/grid/grid_damage_spectral.f90 +++ b/src/grid/grid_damage_spectral.f90 @@ -259,7 +259,7 @@ subroutine formResidual(in,x_scal,f_scal,dummy,ierr) PetscObject :: dummy PetscErrorCode :: ierr integer :: i, j, k, ce - real(pReal) :: phiDot, dPhiDot_dPhi, mobility + real(pReal) :: phiDot, mobility phi_current = x_scal !-------------------------------------------------------------------------------------------------- @@ -281,7 +281,7 @@ subroutine formResidual(in,x_scal,f_scal,dummy,ierr) ce = 0 do k = 1, grid3; do j = 1, grid(2); do i = 1,grid(1) ce = ce + 1 - call damage_nonlocal_getSourceAndItsTangent(phiDot, dPhiDot_dPhi, phi_current(i,j,k),ce) + call damage_nonlocal_getSourceAndItsTangent(phiDot, phi_current(i,j,k),ce) mobility = damage_nonlocal_getMobility(ce) scalarField_real(i,j,k) = params%timeinc*(scalarField_real(i,j,k) + phiDot) & + mobility*(phi_lastInc(i,j,k) - phi_current(i,j,k)) & diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 591bfc04e..49addd098 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -170,12 +170,12 @@ module homogenization real(pReal) :: M end function damage_nonlocal_getMobility - module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, dPhiDot_dPhi, phi, ce) + module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, phi, ce) integer, intent(in) :: ce - real(pReal), intent(in) :: & + real(pReal), intent(in) :: & phi - real(pReal) :: & - phiDot, dPhiDot_dPhi + real(pReal), intent(out) :: & + phiDot end subroutine damage_nonlocal_getSourceAndItsTangent module subroutine damage_nonlocal_putNonLocalDamage(phi,ce) diff --git a/src/homogenization_damage.f90 b/src/homogenization_damage.f90 index ff8ab3976..53b5dd285 100644 --- a/src/homogenization_damage.f90 +++ b/src/homogenization_damage.f90 @@ -42,7 +42,7 @@ module subroutine damage_init() print'(/,a)', ' <<<+- homogenization:damage init -+>>>' - print'(/,a)', ' <<<+- homogenization:damage:isodamage init -+>>>' + print'(/,a)', ' <<<+- homogenization:damage:pass init -+>>>' configHomogenizations => config_material%get('homogenization') allocate(param(configHomogenizations%length)) @@ -113,20 +113,19 @@ end function damage_nonlocal_getMobility !-------------------------------------------------------------------------------------------------- !> @brief calculates homogenized damage driving forces !-------------------------------------------------------------------------------------------------- -module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, dPhiDot_dPhi, phi, ce) +module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, phi, ce) integer, intent(in) :: ce - real(pReal), intent(in) :: & + real(pReal), intent(in) :: & phi - real(pReal) :: & - phiDot, dPhiDot_dPhi + real(pReal), intent(out) :: & + phiDot - phiDot = 0.0_pReal - dPhiDot_dPhi = 0.0_pReal + real(pReal) :: & + dPhiDot_dPhi call phase_damage_getRateAndItsTangents(phiDot, dPhiDot_dPhi, phi, ce) phiDot = phiDot/real(homogenization_Nconstituents(material_homogenizationID(ce)),pReal) - dPhiDot_dPhi = dPhiDot_dPhi/real(homogenization_Nconstituents(material_homogenizationID(ce)),pReal) end subroutine damage_nonlocal_getSourceAndItsTangent diff --git a/src/homogenization_thermal.f90 b/src/homogenization_thermal.f90 index 95b58ec52..8dcddda7a 100644 --- a/src/homogenization_thermal.f90 +++ b/src/homogenization_thermal.f90 @@ -45,7 +45,7 @@ module subroutine thermal_init() print'(/,a)', ' <<<+- homogenization:thermal init -+>>>' - print'(/,a)', ' <<<+- homogenization:thermal:isotemperature init -+>>>' + print'(/,a)', ' <<<+- homogenization:thermal:pass init -+>>>'