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

remove superfluous code and commented

This commit is contained in:
Martin Diehl 2016-01-17 11:14:06 +00:00
parent 11df75dfb2
commit ff840ae8ad
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/homogenization.f90
View File

@ -140,10 +140,14 @@ subroutine homogenization_init
allocate(InstancePosition(material_Nhomogenization),source=0_pInt) allocate(InstancePosition(material_Nhomogenization),source=0_pInt)
#endif #endif
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! parse homogenization from config file ! open material.config
if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present...
call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file
!--------------------------------------------------------------------------------------------------
! parse homogenization from config file
if (any(homogenization_type == HOMOGENIZATION_NONE_ID)) & if (any(homogenization_type == HOMOGENIZATION_NONE_ID)) &
call homogenization_none_init() call homogenization_none_init()
if (any(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID)) & if (any(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID)) &
@ -151,7 +155,6 @@ subroutine homogenization_init
if (any(homogenization_type == HOMOGENIZATION_RGC_ID)) & if (any(homogenization_type == HOMOGENIZATION_RGC_ID)) &
call homogenization_RGC_init(FILEUNIT) call homogenization_RGC_init(FILEUNIT)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! parse thermal from config file ! parse thermal from config file
call IO_checkAndRewind(FILEUNIT) call IO_checkAndRewind(FILEUNIT)
@ -162,7 +165,6 @@ subroutine homogenization_init
if (any(thermal_type == THERMAL_conduction_ID)) & if (any(thermal_type == THERMAL_conduction_ID)) &
call thermal_conduction_init(FILEUNIT) call thermal_conduction_init(FILEUNIT)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! parse damage from config file ! parse damage from config file
call IO_checkAndRewind(FILEUNIT) call IO_checkAndRewind(FILEUNIT)
@ -173,7 +175,6 @@ subroutine homogenization_init
if (any(damage_type == DAMAGE_nonlocal_ID)) & if (any(damage_type == DAMAGE_nonlocal_ID)) &
call damage_nonlocal_init(FILEUNIT) call damage_nonlocal_init(FILEUNIT)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! parse vacancy transport from config file ! parse vacancy transport from config file
call IO_checkAndRewind(FILEUNIT) call IO_checkAndRewind(FILEUNIT)
@ -1156,9 +1157,6 @@ function homogenization_updateState(ip,el)
crystallite_dPdF(1:3,1:3,1:3,1:3,1:homogenization_maxNgrains,ip,el), & crystallite_dPdF(1:3,1:3,1:3,1:3,1:homogenization_maxNgrains,ip,el), &
ip, & ip, &
el) el)
case default chosenHomogenization
homogenization_updateState = &
homogenization_updateState .and. [.true., .true.]
end select chosenHomogenization end select chosenHomogenization
chosenThermal: select case (thermal_type(mesh_element(3,el))) chosenThermal: select case (thermal_type(mesh_element(3,el)))
@ -1168,9 +1166,6 @@ function homogenization_updateState(ip,el)
thermal_adiabatic_updateState(materialpoint_subdt(ip,el), & thermal_adiabatic_updateState(materialpoint_subdt(ip,el), &
ip, & ip, &
el) el)
case default chosenThermal
homogenization_updateState = &
homogenization_updateState .and. [.true., .true.]
end select chosenThermal end select chosenThermal
chosenDamage: select case (damage_type(mesh_element(3,el))) chosenDamage: select case (damage_type(mesh_element(3,el)))
@ -1180,9 +1175,6 @@ function homogenization_updateState(ip,el)
damage_local_updateState(materialpoint_subdt(ip,el), & damage_local_updateState(materialpoint_subdt(ip,el), &
ip, & ip, &
el) el)
case default chosenDamage
homogenization_updateState = &
homogenization_updateState .and. [.true., .true.]
end select chosenDamage end select chosenDamage
chosenVacancyflux: select case (vacancyflux_type(mesh_element(3,el))) chosenVacancyflux: select case (vacancyflux_type(mesh_element(3,el)))
@ -1192,9 +1184,6 @@ function homogenization_updateState(ip,el)
vacancyflux_isochempot_updateState(materialpoint_subdt(ip,el), & vacancyflux_isochempot_updateState(materialpoint_subdt(ip,el), &
ip, & ip, &
el) el)
case default chosenVacancyflux
homogenization_updateState = &
homogenization_updateState .and. [.true., .true.]
end select chosenVacancyflux end select chosenVacancyflux
end function homogenization_updateState end function homogenization_updateState