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

corrected typos and some field related changes

This commit is contained in:
Luv Sharma 2014-09-10 18:26:12 +00:00
parent 0af667e94d
commit 7c60c45f80
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/constitutive.f90
View File

@ -670,9 +670,10 @@ logical function constitutive_collectDeltaState(Tstar_v, ipc, ip, el)
endif endif
end function constitutive_collectDeltaState end function constitutive_collectDeltaState
#ifdef NEWSTATE #ifdef NEWSTATE
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief returns temperature based on each damage model state layout !> @brief Returns the local(unregularised) damage
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function constitutive_getLocalDamage(ipc, ip, el) function constitutive_getLocalDamage(ipc, ip, el)
use prec, only: & use prec, only: &
@ -702,7 +703,9 @@ function constitutive_getLocalDamage(ipc, ip, el)
end function constitutive_getLocalDamage end function constitutive_getLocalDamage
!--------------------------------------------------------------------------------------------------
!> @brief returns nonlocal (regularised) damage
!--------------------------------------------------------------------------------------------------
function constitutive_getNonlocalDamage(ipc, ip, el) function constitutive_getNonlocalDamage(ipc, ip, el)
use prec, only: & use prec, only: &
pReal pReal
@ -725,7 +728,7 @@ function constitutive_getNonlocalDamage(ipc, ip, el)
select case(field_damage_type(material_homog(ip,el))) select case(field_damage_type(material_homog(ip,el)))
case (FIELD_DAMAGE_LOCAL_ID) case (FIELD_DAMAGE_LOCAL_ID)
constitutive_getNonlocalDamage = 1.0_pReal constitutive_getNonlocalDamage = constitutive_getLocalDamage(ipc, ip, el)
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_ID)
constitutive_getNonlocalDamage = fieldDamage(material_homog(ip,el))% & constitutive_getNonlocalDamage = fieldDamage(material_homog(ip,el))% &
@ -734,7 +737,9 @@ function constitutive_getNonlocalDamage(ipc, ip, el)
end select end select
end function constitutive_getNonlocalDamage end function constitutive_getNonlocalDamage
!--------------------------------------------------------------------------------------------------
!> @brief returns local (unregularised) temperature
!--------------------------------------------------------------------------------------------------
function constitutive_getAdiabaticThermal(ipc, ip, el) function constitutive_getAdiabaticThermal(ipc, ip, el)
use prec, only: & use prec, only: &
pReal pReal
@ -765,7 +770,9 @@ function constitutive_getAdiabaticThermal(ipc, ip, el)
end function constitutive_getAdiabaticThermal end function constitutive_getAdiabaticThermal
!--------------------------------------------------------------------------------------------------
!> @brief returns nonlocal (regularised) temperature
!--------------------------------------------------------------------------------------------------
function constitutive_getConductionThermal(ipc, ip, el) function constitutive_getConductionThermal(ipc, ip, el)
use prec, only: & use prec, only: &
pReal pReal
@ -774,8 +781,8 @@ function constitutive_getConductionThermal(ipc, ip, el)
material_phase, & material_phase, &
fieldThermal, & fieldThermal, &
field_thermal_type, & field_thermal_type, &
FIELD_DAMAGE_LOCAL_ID, & FIELD_THERMAL_ADIABATIC_ID, &
FIELD_DAMAGE_NONLOCAL_ID, & FIELD_THERMAL_CONDUCTION_ID, &
material_homog material_homog
use lattice, only: & use lattice, only: &
lattice_referenceTemperature lattice_referenceTemperature
@ -788,10 +795,10 @@ function constitutive_getConductionThermal(ipc, ip, el)
select case(field_thermal_type(material_homog(ip,el))) select case(field_thermal_type(material_homog(ip,el)))
case (FIELD_DAMAGE_LOCAL_ID) case (FIELD_THERMAL_ADIABATIC_ID)
constitutive_getConductionThermal = lattice_referenceTemperature(material_phase(ipc,ip,el)) ! check constitutive_getConductionThermal = constitutive_getAdiabaticThermal(ipc, ip, el)
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_THERMAL_CONDUCTION_ID)
constitutive_getConductionThermal = fieldThermal(material_homog(ip,el))% & constitutive_getConductionThermal = fieldThermal(material_homog(ip,el))% &
state(1,mappingHomogenization(1,ip,el)) ! Taylor type state(1,mappingHomogenization(1,ip,el)) ! Taylor type
@ -800,9 +807,6 @@ function constitutive_getConductionThermal(ipc, ip, el)
end function constitutive_getConductionThermal end function constitutive_getConductionThermal
#endif #endif
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief returns array of constitutive results !> @brief returns array of constitutive results
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

21
code/homogenization.f90
View File

@ -116,6 +116,10 @@ subroutine homogenization_init()
mesh_element, & mesh_element, &
FE_Nips, & FE_Nips, &
FE_geomtype FE_geomtype
#ifdef NEWSTATE
use lattice, only: &
lattice_referenceTemperature
#endif
use constitutive, only: & use constitutive, only: &
constitutive_maxSizePostResults constitutive_maxSizePostResults
use constitutive_damage, only: & use constitutive_damage, only: &
@ -214,12 +218,14 @@ subroutine homogenization_init()
case (FIELD_THERMAL_ADIABATIC_ID) case (FIELD_THERMAL_ADIABATIC_ID)
fieldThermal(p)%sizeState = 0_pInt fieldThermal(p)%sizeState = 0_pInt
fieldThermal(p)%sizePostResults = 0_pInt fieldThermal(p)%sizePostResults = 0_pInt
allocate(fieldThermal(p)%state(fieldThermal(p)%sizeState,NofMyField), source = 1.0_pReal) allocate(fieldThermal(p)%state(fieldThermal(p)%sizeState,NofMyField), &
source = 273.0_pReal) ! ToDo: temporary fix for now
case (FIELD_THERMAL_CONDUCTION_ID) case (FIELD_THERMAL_CONDUCTION_ID)
fieldThermal(p)%sizeState = 1_pInt fieldThermal(p)%sizeState = 1_pInt
fieldThermal(p)%sizePostResults = 1_pInt fieldThermal(p)%sizePostResults = 1_pInt
allocate(fieldThermal(p)%state(fieldThermal(p)%sizeState,NofMyField), source = 1.0_pReal) allocate(fieldThermal(p)%state(fieldThermal(p)%sizeState,NofMyField), &
source = 273.0_pReal) ! ToDo: temporary fix for now
end select end select
enddo enddo
@ -1202,7 +1208,7 @@ real(pReal) function field_getDAMAGE(ip,el)
end function field_getDAMAGE end function field_getDAMAGE
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief ToDo !> @brief Sets the regularised damage value in field state
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme
use mesh, only: & use mesh, only: &
@ -1225,10 +1231,6 @@ subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme
Ngrains, ipc Ngrains, ipc
select case(field_damage_type(material_homog(ip,el))) select case(field_damage_type(material_homog(ip,el)))
case (FIELD_DAMAGE_LOCAL_ID)
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_ID)
fieldDamage(material_homog(ip,el))% & fieldDamage(material_homog(ip,el))% &
state(1:fieldDamage(material_homog(ip,el))%sizeState, & state(1:fieldDamage(material_homog(ip,el))%sizeState, &
@ -1280,7 +1282,7 @@ real(pReal) function field_getThermal(ip,el)
end function field_getThermal end function field_getThermal
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief ToDo, !> @brief Sets the regularised temperature value in field state
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine field_putThermal(ip,el,fieldThermalValue) subroutine field_putThermal(ip,el,fieldThermalValue)
use mesh, only: & use mesh, only: &
@ -1302,9 +1304,6 @@ subroutine field_putThermal(ip,el,fieldThermalValue)
Ngrains, ipc Ngrains, ipc
select case(field_thermal_type(material_homog(ip,el))) select case(field_thermal_type(material_homog(ip,el)))
case (FIELD_THERMAL_ADIABATIC_ID)
case (FIELD_THERMAL_CONDUCTION_ID) case (FIELD_THERMAL_CONDUCTION_ID)
fieldThermal(material_homog(ip,el))% & fieldThermal(material_homog(ip,el))% &
state(1:fieldThermal(material_homog(ip,el))%sizeState, & state(1:fieldThermal(material_homog(ip,el))%sizeState, &