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

polishing style

This commit is contained in:
Martin Diehl 2014-09-13 10:04:44 +00:00
parent 05d980f1e3
commit 7cb7815176
4 changed files with 90 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/constitutive.f90
View File

@ -717,7 +717,6 @@ function constitutive_getNonlocalDamage(ipc, ip, el)
FIELD_DAMAGE_LOCAL_ID, & FIELD_DAMAGE_LOCAL_ID, &
FIELD_DAMAGE_NONLOCAL_ID FIELD_DAMAGE_NONLOCAL_ID
implicit none implicit none
integer(pInt), intent(in) :: & integer(pInt), intent(in) :: &
ipc, & !< grain number ipc, & !< grain number

3
code/crystallite.f90
View File

@ -3421,9 +3421,6 @@ end function crystallite_stateJump
!> @brief Map 2nd order tensor to reference config !> @brief Map 2nd order tensor to reference config
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function crystallite_push33ToRef(g,i,e, tensor33) function crystallite_push33ToRef(g,i,e, tensor33)
use prec, only: &
pInt, &
pReal
use math, only: & use math, only: &
math_inv33 math_inv33

28
code/homogenization.f90
View File

@ -977,7 +977,7 @@ function field_getSpecificHeat(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getSpecificHeat =0.0_pReal field_getSpecificHeat =0.0_pReal
@ -1020,7 +1020,7 @@ function field_getMassDensity(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getMassDensity =0.0_pReal field_getMassDensity =0.0_pReal
@ -1064,7 +1064,7 @@ function field_getThermalConductivity33(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getThermalConductivity33 =0.0_pReal field_getThermalConductivity33 =0.0_pReal
@ -1106,7 +1106,7 @@ function field_getDamageDiffusion33(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getDamageDiffusion33 =0.0_pReal field_getDamageDiffusion33 =0.0_pReal
@ -1146,7 +1146,8 @@ real(pReal) function field_getDamageMobility(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getDamageMobility =0.0_pReal field_getDamageMobility =0.0_pReal
@ -1186,7 +1187,8 @@ real(pReal) function field_getDAMAGE(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! computing the damage value needed to be passed to field solver ! computing the damage value needed to be passed to field solver
field_getDAMAGE =0.0_pReal field_getDAMAGE =0.0_pReal
@ -1211,14 +1213,10 @@ end function field_getDAMAGE
!> @brief Sets the regularised damage value in field state !> @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: &
mesh_element
use material, only: & use material, only: &
fieldDamage, & fieldDamage, &
mappingHomogenization, & mappingHomogenization, &
material_homog, &
field_damage_type, & field_damage_type, &
FIELD_DAMAGE_LOCAL_ID, &
FIELD_DAMAGE_NONLOCAL_ID FIELD_DAMAGE_NONLOCAL_ID
implicit none implicit none
@ -1227,8 +1225,6 @@ subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme
el el
real(pReal), intent(in) :: & real(pReal), intent(in) :: &
fieldDamageValue fieldDamageValue
integer(pInt) :: &
Ngrains, ipc
select case(field_damage_type(material_homog(ip,el))) select case(field_damage_type(material_homog(ip,el)))
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_ID)
@ -1260,7 +1256,8 @@ real(pReal) function field_getThermal(ip,el)
ip, & !< integration point number ip, & !< integration point number
el !< element number el !< element number
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc ipc
field_getThermal = 1.0_pReal field_getThermal = 1.0_pReal
@ -1284,14 +1281,11 @@ end function field_getThermal
!> @brief Sets the regularised temperature value in field state !> @brief Sets the regularised temperature value in field state
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine field_putThermal(ip,el,fieldThermalValue) subroutine field_putThermal(ip,el,fieldThermalValue)
use mesh, only: &
mesh_element
use material, only: & use material, only: &
material_homog, & material_homog, &
fieldThermal, & fieldThermal, &
mappingHomogenization, & mappingHomogenization, &
field_thermal_type, & field_thermal_type, &
FIELD_THERMAL_ADIABATIC_ID, &
FIELD_THERMAL_CONDUCTION_ID FIELD_THERMAL_CONDUCTION_ID
implicit none implicit none
@ -1300,8 +1294,6 @@ subroutine field_putThermal(ip,el,fieldThermalValue)
el el
real(pReal), intent(in) :: & real(pReal), intent(in) :: &
fieldThermalValue fieldThermalValue
integer(pInt) :: &
Ngrains, ipc
select case(field_thermal_type(material_homog(ip,el))) select case(field_thermal_type(material_homog(ip,el)))
case (FIELD_THERMAL_CONDUCTION_ID) case (FIELD_THERMAL_CONDUCTION_ID)

4
code/lattice.f90
View File

@ -251,7 +251,7 @@ module lattice
],[ 4_pInt,LATTICE_fcc_Ntrans]) ],[ 4_pInt,LATTICE_fcc_Ntrans])
real(pReal), dimension(12,LATTICE_fcc_Ntrans), parameter, private :: & real(pReal), dimension(12,LATTICE_fcc_Ntrans), parameter, private :: &
LATTICE_fcc_projectionTrans = reshape([& LATTICE_fcc_projectionTrans = reshape(real([&
0, 1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, & 0, 1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, &
-1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, & -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, &
1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, & 1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &
@ -264,7 +264,7 @@ module lattice
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,-1, & 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,-1, &
0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, & 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, &
0, 0, 0, 0, 0, 0, 0, 0, 0, 1,-1, 0 & 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,-1, 0 &
],[ 12_pInt,LATTICE_fcc_Ntrans]) ],pReal),[ 12_pInt,LATTICE_fcc_Ntrans])
integer(pInt), dimension(2_pInt,LATTICE_fcc_Ntrans), parameter, public :: & integer(pInt), dimension(2_pInt,LATTICE_fcc_Ntrans), parameter, public :: &
LATTICE_fcc_transNucleationTwinPair = reshape(int( [& LATTICE_fcc_transNucleationTwinPair = reshape(int( [&