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

moved (back) to a better place

This commit is contained in:
Martin Diehl 2019-06-15 15:30:41 +02:00
parent 57a0d33293
commit 856ef15184
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/config.f90
View File

@ -33,12 +33,6 @@ module config
config_name_microstructure, & !< name of each microstructure config_name_microstructure, & !< name of each microstructure
config_name_texture !< name of each texture config_name_texture !< name of each texture
! ToDo: Remove, use size(config_phase) etc
integer, public, protected :: &
material_Nphase, & !< number of phases
material_Nhomogenization !< number of homogenizations
public :: & public :: &
config_init, & config_init, &
config_deallocate config_deallocate
@ -96,20 +90,17 @@ subroutine config_init
if (verbose) write(6,'(a)') ' Homogenization parsed'; flush(6) if (verbose) write(6,'(a)') ' Homogenization parsed'; flush(6)
case (trim('texture')) case (trim('texture'))
call parse_materialConfig(texture_name,config_texture,line,fileContent(i+1:)) call parse_materialConfig(config_name_texture,config_texture,line,fileContent(i+1:))
if (verbose) write(6,'(a)') ' Texture parsed'; flush(6) if (verbose) write(6,'(a)') ' Texture parsed'; flush(6)
end select end select
enddo enddo
material_Nhomogenization = size(config_homogenization) if (size(config_homogenization) < 1) call IO_error(160,ext_msg='<homogenization>')
material_Nphase = size(config_phase)
if (material_Nhomogenization < 1) call IO_error(160,ext_msg='<homogenization>')
if (size(config_microstructure) < 1) call IO_error(160,ext_msg='<microstructure>') if (size(config_microstructure) < 1) call IO_error(160,ext_msg='<microstructure>')
if (size(config_crystallite) < 1) call IO_error(160,ext_msg='<crystallite>') if (size(config_crystallite) < 1) call IO_error(160,ext_msg='<crystallite>')
if (material_Nphase < 1) call IO_error(160,ext_msg='<phase>') if (size(config_phase) < 1) call IO_error(160,ext_msg='<phase>')
if (size(config_texture) < 1) call IO_error(160,ext_msg='<texture>') if (size(config_texture) < 1) call IO_error(160,ext_msg='<texture>')

30
src/material.f90
View File

@ -98,6 +98,10 @@ module material
integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: &
damage_type !< nonlocal damage model damage_type !< nonlocal damage model
integer, public, protected :: &
material_Nphase, & !< number of phases
material_Nhomogenization !< number of homogenizations
integer(kind(SOURCE_undefined_ID)), dimension(:,:), allocatable, public, protected :: & integer(kind(SOURCE_undefined_ID)), dimension(:,:), allocatable, public, protected :: &
phase_source, & !< active sources mechanisms of each phase phase_source, & !< active sources mechanisms of each phase
phase_kinematics, & !< active kinematic mechanisms of each phase phase_kinematics, & !< active kinematic mechanisms of each phase
@ -261,23 +265,27 @@ subroutine material_init
call material_parseTexture() call material_parseTexture()
if (iand(myDebug,debug_levelBasic) /= 0) write(6,'(a)') ' Texture parsed'; flush(6) if (iand(myDebug,debug_levelBasic) /= 0) write(6,'(a)') ' Texture parsed'; flush(6)
allocate(plasticState (size(config_phase))) material_Nphase = size(config_phase)
allocate(sourceState (size(config_phase))) material_Nhomogenization = size(config_homogenization)
do myPhase = 1,size(config_phase)
allocate(plasticState(material_Nphase))
allocate(sourceState (material_Nphase))
do myPhase = 1,material_Nphase
allocate(sourceState(myPhase)%p(phase_Nsources(myPhase))) allocate(sourceState(myPhase)%p(phase_Nsources(myPhase)))
enddo enddo
allocate(homogState (size(config_homogenization))) allocate(homogState (material_Nhomogenization))
allocate(thermalState (size(config_homogenization))) allocate(thermalState (material_Nhomogenization))
allocate(damageState (size(config_homogenization))) allocate(damageState (material_Nhomogenization))
allocate(thermalMapping (size(config_homogenization))) allocate(thermalMapping (material_Nhomogenization))
allocate(damageMapping (size(config_homogenization))) allocate(damageMapping (material_Nhomogenization))
allocate(temperature (size(config_homogenization))) allocate(temperature (material_Nhomogenization))
allocate(damage (size(config_homogenization))) allocate(damage (material_Nhomogenization))
allocate(temperatureRate (size(config_homogenization))) allocate(temperatureRate (material_Nhomogenization))
do m = 1,size(config_microstructure) do m = 1,size(config_microstructure)
if(microstructure_crystallite(m) < 1 .or. & if(microstructure_crystallite(m) < 1 .or. &