diff --git a/src/material.f90 b/src/material.f90 index 9f3215551..f4014ec84 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -180,8 +180,6 @@ module material homogenization_active ! BEGIN DEPRECATED - integer, dimension(:,:,:), allocatable, public :: phasememberAt !< memberID of given phase at every material point (ipc,ip,el) - integer, dimension(:,:,:), allocatable, public, target :: mappingHomogenization !< mapping from material points to offset in heterogenous state/field integer, dimension(:,:), allocatable, private, target :: mappingHomogenizationConst !< mapping from material points to offset in constant state/field ! END DEPRECATED @@ -246,11 +244,7 @@ contains subroutine material_init integer, parameter :: FILEUNIT = 210 - integer :: m,c,h, myDebug, myPhase, myHomog - integer :: & - g, & !< grain number - i, & !< integration point number - e !< element number + integer :: i,e,m,c,h, myDebug, myPhase, myHomog integer, dimension(:), allocatable :: & CounterPhase, & CounterHomogenization @@ -374,24 +368,15 @@ subroutine material_init !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! BEGIN DEPRECATED - allocate(phasememberAt ( homogenization_maxNgrains,discretization_nIP,discretization_nElem),source=0) allocate(mappingHomogenization (2, discretization_nIP,discretization_nElem),source=0) allocate(mappingHomogenizationConst( discretization_nIP,discretization_nElem),source=1) CounterHomogenization=0 - CounterPhase =0 - - do e = 1,discretization_nElem - myHomog = discretization_homogenizationAt(e) + myHomog = discretization_homogenizationAt(e) do i = 1, discretization_nIP CounterHomogenization(myHomog) = CounterHomogenization(myHomog) + 1 mappingHomogenization(1:2,i,e) = [CounterHomogenization(myHomog),huge(1)] - do g = 1,homogenization_Ngrains(myHomog) - myPhase = material_phase(g,i,e) - CounterPhase(myPhase) = CounterPhase(myPhase)+1 ! not distinguishing between instances of same phase - phasememberAt(g,i,e) = CounterPhase(myPhase) - enddo enddo enddo ! END DEPRECATED diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 4d84b503e..f82a6e711 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -590,7 +590,7 @@ function plastic_dislotwin_homogenizedC(ipc,ip,el) result(homogenizedC) of real(pReal) :: f_unrotated - of = phasememberAt(ipc,ip,el) + of = material_phasememberAt(ipc,ip,el) associate(prm => param(phase_plasticityInstance(material_phase(ipc,ip,el))),& stt => state(phase_plasticityInstance(material_phase(ipc,ip,el)))) diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 46d0905dc..a658f17d6 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -128,7 +128,7 @@ subroutine plastic_isotropic_init #ifdef DEBUG if (p==material_phase(debug_g,debug_i,debug_e)) & - prm%of_debug = phasememberAt(debug_g,debug_i,debug_e) + prm%of_debug = material_phasememberAt(debug_g,debug_i,debug_e) #endif prm%xi_0 = config%getFloat('tau0') diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index ab68eb176..c27c100fd 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -147,7 +147,7 @@ subroutine plastic_kinehardening_init #ifdef DEBUG if (p==material_phase(debug_g,debug_i,debug_e)) then - prm%of_debug = phasememberAt(debug_g,debug_i,debug_e) + prm%of_debug = material_phasememberAt(debug_g,debug_i,debug_e) endif #endif diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index dd58e60be..88f71496b 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -766,7 +766,7 @@ subroutine plastic_nonlocal_init ! get the total volume of the instance do e = 1,discretization_nElem do i = 1,discretization_nIP - if (material_phase(1,i,e) == phase) volume(phasememberAt(1,i,e)) = IPvolume(i,e) + if (material_phase(1,i,e) == phase) volume(material_phasememberAt(1,i,e)) = IPvolume(i,e) enddo enddo totalVolume = sum(volume) @@ -935,7 +935,7 @@ subroutine plastic_nonlocal_dependentState(Fe, Fp, ip, el) do n = 1,nIPneighbors neighbor_el = IPneighborhood(1,n,ip,el) neighbor_ip = IPneighborhood(2,n,ip,el) - no = phasememberAt(1,neighbor_ip,neighbor_el) + no = material_phasememberAt(1,neighbor_ip,neighbor_el) if (neighbor_el > 0 .and. neighbor_ip > 0) then neighbor_instance = phase_plasticityInstance(material_phase(1,neighbor_ip,neighbor_el)) if (neighbor_instance == instance) then