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

WIP: reading in new style

This commit is contained in:
Martin Diehl 2018-07-30 11:45:16 +02:00
parent 7f0bf8c4cd
commit a908e66306
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/homogenization.f90
View File

@ -494,7 +494,6 @@ subroutine materialpoint_stressAndItsTangent(updateJaco,dt)
subStepMinHomog, & subStepMinHomog, &
subStepSizeHomog, & subStepSizeHomog, &
stepIncreaseHomog, & stepIncreaseHomog, &
nHomog, &
nMPstate nMPstate
use math, only: & use math, only: &
math_transpose33 math_transpose33

25
src/lattice.f90
View File

@ -1379,13 +1379,14 @@ subroutine lattice_init
lattice_structure(p) = LATTICE_ort_ID lattice_structure(p) = LATTICE_ort_ID
end select end select
! case('trans_lattice_structure') tag = 'undefined'
! select case(trim(IO_lc(IO_stringValue(line,chunkPos,2_pInt)))) tag = config_phase(p)%getString('trans_lattice_structure',defaultVal=tag)
! case('bcc') select case(trim(tag))
! trans_lattice_structure(section) = LATTICE_bcc_ID case('bcc')
! case('hex','hexagonal') trans_lattice_structure(section) = LATTICE_bcc_ID
! trans_lattice_structure(section) = LATTICE_hex_ID case('hex','hexagonal')
! end select trans_lattice_structure(section) = LATTICE_hex_ID
end select
lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal) lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal)
lattice_C66(1,2,p) = config_phase(p)%getFloat('c12',defaultVal=0.0_pReal) lattice_C66(1,2,p) = config_phase(p)%getFloat('c12',defaultVal=0.0_pReal)
@ -1411,12 +1412,10 @@ subroutine lattice_init
a_fcc(p) = config_phase(p)%getFloat('a_fcc',defaultVal=0.0_pReal) a_fcc(p) = config_phase(p)%getFloat('a_fcc',defaultVal=0.0_pReal)
a_bcc(p) = config_phase(p)%getFloat('a_bcc',defaultVal=0.0_pReal) a_bcc(p) = config_phase(p)%getFloat('a_bcc',defaultVal=0.0_pReal)
! case ('thermal_conductivity11') lattice_thermalConductivity33(1,1,p) = config_phase(p)%getFloat('thermal_conductivity11')
! lattice_thermalConductivity33(1,1,section) = IO_floatValue(line,chunkPos,2_pInt) lattice_thermalConductivity33(2,2,p) = config_phase(p)%getFloat('thermal_conductivity22')
! case ('thermal_conductivity22') lattice_thermalConductivity33(3,3,p) = config_phase(p)%getFloat('thermal_conductivity33')
! lattice_thermalConductivity33(2,2,section) = IO_floatValue(line,chunkPos,2_pInt)
! case ('thermal_conductivity33')
! lattice_thermalConductivity33(3,3,section) = IO_floatValue(line,chunkPos,2_pInt)
! case ('thermal_expansion11') ! case ('thermal_expansion11')
! do i = 2_pInt, min(4,chunkPos(1)) ! read up to three parameters (constant, linear, quadratic with T) ! do i = 2_pInt, min(4,chunkPos(1)) ! read up to three parameters (constant, linear, quadratic with T)
! lattice_thermalExpansion33(1,1,i-1_pInt,section) = IO_floatValue(line,chunkPos,i) ! lattice_thermalExpansion33(1,1,i-1_pInt,section) = IO_floatValue(line,chunkPos,i)

5
src/numerics.f90
View File

@ -16,7 +16,6 @@ module numerics
integer(pInt), protected, public :: & integer(pInt), protected, public :: &
iJacoStiffness = 1_pInt, & !< frequency of stiffness update iJacoStiffness = 1_pInt, & !< frequency of stiffness update
iJacoLpresiduum = 1_pInt, & !< frequency of Jacobian update of residuum in Lp iJacoLpresiduum = 1_pInt, & !< frequency of Jacobian update of residuum in Lp
nHomog = 20_pInt, & !< homogenization loop limit (only for debugging info, loop limit is determined by "subStepMinHomog")
nMPstate = 10_pInt, & !< materialpoint state loop limit nMPstate = 10_pInt, & !< materialpoint state loop limit
nCryst = 20_pInt, & !< crystallite loop limit (only for debugging info, loop limit is determined by "subStepMinCryst") nCryst = 20_pInt, & !< crystallite loop limit (only for debugging info, loop limit is determined by "subStepMinCryst")
nState = 10_pInt, & !< state loop limit nState = 10_pInt, & !< state loop limit
@ -284,8 +283,6 @@ subroutine numerics_init
pert_Fg = IO_floatValue(line,chunkPos,2_pInt) pert_Fg = IO_floatValue(line,chunkPos,2_pInt)
case ('pert_method') case ('pert_method')
pert_method = IO_intValue(line,chunkPos,2_pInt) pert_method = IO_intValue(line,chunkPos,2_pInt)
case ('nhomog')
nHomog = IO_intValue(line,chunkPos,2_pInt)
case ('nmpstate') case ('nmpstate')
nMPstate = IO_intValue(line,chunkPos,2_pInt) nMPstate = IO_intValue(line,chunkPos,2_pInt)
case ('ncryst') case ('ncryst')
@ -536,7 +533,6 @@ subroutine numerics_init
write(6,'(a24,1x,L8)') ' use ping pong scheme: ',usepingpong write(6,'(a24,1x,L8)') ' use ping pong scheme: ',usepingpong
write(6,'(a24,1x,es8.1,/)')' unitlength: ',numerics_unitlength write(6,'(a24,1x,es8.1,/)')' unitlength: ',numerics_unitlength
write(6,'(a24,1x,i8)') ' nHomog: ',nHomog
write(6,'(a24,1x,es8.1)') ' subStepMinHomog: ',subStepMinHomog write(6,'(a24,1x,es8.1)') ' subStepMinHomog: ',subStepMinHomog
write(6,'(a24,1x,es8.1)') ' subStepSizeHomog: ',subStepSizeHomog write(6,'(a24,1x,es8.1)') ' subStepSizeHomog: ',subStepSizeHomog
write(6,'(a24,1x,es8.1)') ' stepIncreaseHomog: ',stepIncreaseHomog write(6,'(a24,1x,es8.1)') ' stepIncreaseHomog: ',stepIncreaseHomog
@ -646,7 +642,6 @@ subroutine numerics_init
if (pert_Fg <= 0.0_pReal) call IO_error(301_pInt,ext_msg='pert_Fg') if (pert_Fg <= 0.0_pReal) call IO_error(301_pInt,ext_msg='pert_Fg')
if (pert_method <= 0_pInt .or. pert_method >= 4_pInt) & if (pert_method <= 0_pInt .or. pert_method >= 4_pInt) &
call IO_error(301_pInt,ext_msg='pert_method') call IO_error(301_pInt,ext_msg='pert_method')
if (nHomog < 1_pInt) call IO_error(301_pInt,ext_msg='nHomog')
if (nMPstate < 1_pInt) call IO_error(301_pInt,ext_msg='nMPstate') if (nMPstate < 1_pInt) call IO_error(301_pInt,ext_msg='nMPstate')
if (nCryst < 1_pInt) call IO_error(301_pInt,ext_msg='nCryst') if (nCryst < 1_pInt) call IO_error(301_pInt,ext_msg='nCryst')
if (nState < 1_pInt) call IO_error(301_pInt,ext_msg='nState') if (nState < 1_pInt) call IO_error(301_pInt,ext_msg='nState')