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

extra function not (yet) needed

This commit is contained in:
Martin Diehl 2020-12-16 09:13:13 +01:00
parent 710c217d8a
commit d7889aff12
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CPFEM.f90
View File

@ -89,11 +89,10 @@ subroutine CPFEM_initAll
call lattice_init call lattice_init
call material_init(.false.) call material_init(.false.)
call constitutive_init call constitutive_init
call crystallite_init
call homogenization_init call homogenization_init
call crystallite_init
call CPFEM_init call CPFEM_init
call config_deallocate call config_deallocate
call crystallite_setInitialValues ! ToDo: MD More general approach needed
end subroutine CPFEM_initAll end subroutine CPFEM_initAll

4
src/CPFEM2.f90
View File

@ -63,12 +63,10 @@ subroutine CPFEM_initAll
#endif #endif
call material_init(restart=interface_restartInc>0) call material_init(restart=interface_restartInc>0)
call constitutive_init call constitutive_init
call crystallite_init
call homogenization_init call homogenization_init
call crystallite_init
call CPFEM_init call CPFEM_init
call config_deallocate call config_deallocate
if (interface_restartInc==0) &
call crystallite_setInitialValues ! ToDo: MD More general approach needed
end subroutine CPFEM_initAll end subroutine CPFEM_initAll

23
src/crystallite.f90
View File

@ -69,9 +69,9 @@ module crystallite
real(pReal), dimension(:,:,:,:,:), allocatable, public :: & real(pReal), dimension(:,:,:,:,:), allocatable, public :: &
crystallite_partitionedF !< def grad to be reached at end of homog inc crystallite_partitionedF !< def grad to be reached at end of homog inc
logical, dimension(:,:,:), allocatable, public :: & logical, dimension(:,:,:), allocatable, public :: &
crystallite_requested !< used by upper level (homogenization) to request crystallite calculation crystallite_requested !< used by upper level (homogenization) to request crystallite calculation
logical, dimension(:,:,:), allocatable :: & logical, dimension(:,:,:), allocatable :: &
crystallite_converged !< convergence flag crystallite_converged !< convergence flag
type :: tOutput !< new requested output (per phase) type :: tOutput !< new requested output (per phase)
@ -115,7 +115,6 @@ module crystallite
public :: & public :: &
crystallite_init, & crystallite_init, &
crystallite_setInitialValues, &
crystallite_stress, & crystallite_stress, &
crystallite_stressTangent, & crystallite_stressTangent, &
crystallite_orientations, & crystallite_orientations, &
@ -138,6 +137,9 @@ subroutine crystallite_init
integer :: & integer :: &
p, & p, &
c, & !< counter in integration point component loop
i, & !< counter in integration point loop
e, & !< counter in element loop
cMax, & !< maximum number of integration point components cMax, & !< maximum number of integration point components
iMax, & !< maximum number of integration points iMax, & !< maximum number of integration points
eMax !< maximum number of elements eMax !< maximum number of elements
@ -255,19 +257,6 @@ subroutine crystallite_init
endif endif
#endif #endif
end subroutine crystallite_init
!--------------------------------------------------------------------------------------------------
!> @brief Set initial values
!--------------------------------------------------------------------------------------------------
subroutine crystallite_setInitialValues
integer :: &
c, & !< counter in integration point component loop
i, & !< counter in integration point loop
e !< counter in element loop
!$OMP PARALLEL DO PRIVATE(i,c) !$OMP PARALLEL DO PRIVATE(i,c)
do e = FEsolving_execElem(1),FEsolving_execElem(2) do e = FEsolving_execElem(1),FEsolving_execElem(2)
do i = FEsolving_execIP(1), FEsolving_execIP(2); do c = 1, homogenization_Nconstituents(material_homogenizationAt(e)) do i = FEsolving_execIP(1), FEsolving_execIP(2); do c = 1, homogenization_Nconstituents(material_homogenizationAt(e))
@ -306,7 +295,7 @@ subroutine crystallite_setInitialValues
!$OMP END PARALLEL DO !$OMP END PARALLEL DO
end subroutine crystallite_setInitialValues end subroutine crystallite_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------