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

now compiling thermal_adiabatic.f90 also and some field related changes

This commit is contained in:
Luv Sharma 2014-09-10 15:05:28 +00:00
parent e8f8655c98
commit 7b5cbf4199
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/Makefile
View File

@ -362,7 +362,7 @@ DAMAGE_FILES = \
endif endif
ifeq "$(STATE)" "NEWH" ifeq "$(STATE)" "NEWH"
THERMAL_FILES = \ THERMAL_FILES = \
thermal_none.o thermal_none.o thermal_adiabatic.o
else else
THERMAL_FILES = \ THERMAL_FILES = \
thermal_none.o thermal_conduction.o thermal_none.o thermal_conduction.o
@ -532,6 +532,9 @@ thermal_none.o: thermal_none.f90 \
thermal_conduction.o: thermal_conduction.f90 \ thermal_conduction.o: thermal_conduction.f90 \
lattice.o lattice.o
thermal_adiabatic.o: thermal_adiabatic.f90 \
lattice.o
lattice.o: lattice.f90 \ lattice.o: lattice.f90 \
material.o material.o

16
code/constitutive.f90
View File

@ -725,7 +725,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 ! doubt constitutive_getNonlocalDamage = 1.0_pReal
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_ID)
constitutive_getNonlocalDamage = fieldDamage(material_homog(ip,el))% & constitutive_getNonlocalDamage = fieldDamage(material_homog(ip,el))% &
@ -743,8 +743,8 @@ function constitutive_getAdiabaticThermal(ipc, ip, el)
LOCAL_THERMAL_none_ID, & LOCAL_THERMAL_none_ID, &
LOCAL_THERMAL_HEATGEN_ID, & LOCAL_THERMAL_HEATGEN_ID, &
phase_thermal phase_thermal
! use thermal_adiabatic, only: & use thermal_adiabatic, only: &
! constitutive_heatgen_getThermal constitutive_heatgen_getThermal
use lattice, only: & use lattice, only: &
lattice_referenceTemperature lattice_referenceTemperature
@ -757,10 +757,10 @@ function constitutive_getAdiabaticThermal(ipc, ip, el)
select case (phase_thermal(material_phase(ipc,ip,el))) select case (phase_thermal(material_phase(ipc,ip,el)))
case (LOCAL_THERMAL_none_ID) case (LOCAL_THERMAL_none_ID)
! constitutive_getAdiabaticThermal = lattice_referenceTemperature(material_phase(ipc,ip,el)) constitutive_getAdiabaticThermal = lattice_referenceTemperature(material_phase(ipc,ip,el))
case (LOCAL_THERMAL_HEATGEN_ID) case (LOCAL_THERMAL_HEATGEN_ID)
! constitutive_getAdiabaticThermal = constitutive_heatgen_getThermal(ipc, ip, el) constitutive_getAdiabaticThermal = constitutive_heatgen_getThermal(ipc, ip, el)
end select end select
end function constitutive_getAdiabaticThermal end function constitutive_getAdiabaticThermal
@ -788,11 +788,11 @@ 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_DAMAGE_LOCAL_ID)
! constitutive_getConductionThermal = lattice_referenceTemperature(material_phase(ipc,ip,el)) ! check constitutive_getConductionThermal = lattice_referenceTemperature(material_phase(ipc,ip,el)) ! check
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_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
end select end select

9
code/homogenization.f90
View File

@ -65,6 +65,8 @@ module homogenization
#ifdef NEWSTATE #ifdef NEWSTATE
field_getDAMAGE, & field_getDAMAGE, &
field_putDAMAGE, & field_putDAMAGE, &
field_getThermal, &
field_putThermal, &
field_getDamageMobility, & field_getDamageMobility, &
field_getDamageDiffusion33, & field_getDamageDiffusion33, &
field_getThermalConductivity33, & field_getThermalConductivity33, &
@ -1200,7 +1202,7 @@ real(pReal) function field_getDAMAGE(ip,el)
end function field_getDAMAGE end function field_getDAMAGE
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief ToDo, to be pushed in crystallite/material?? !> @brief ToDo
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme
use mesh, only: & use mesh, only: &
@ -1259,7 +1261,6 @@ real(pReal) function field_getThermal(ip,el)
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc Ngrains, ipc
! computing the damage value needed to be passed to field solver
field_getThermal =1.0_pReal field_getThermal =1.0_pReal
select case(field_thermal_type(material_homog(ip,el))) select case(field_thermal_type(material_homog(ip,el)))
@ -1279,9 +1280,9 @@ real(pReal) function field_getThermal(ip,el)
end function field_getThermal end function field_getThermal
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief ToDo, to be pushed in crystallite/material?? !> @brief ToDo,
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine field_putThermal(ip,el,fieldThermalValue) ! naming scheme subroutine field_putThermal(ip,el,fieldThermalValue)
use mesh, only: & use mesh, only: &
mesh_element mesh_element
use material, only: & use material, only: &