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

renumbered some errors, fixed non-existing errors

This commit is contained in:
Philip Eisenlohr 2014-12-03 00:42:35 +00:00
parent 01a8c500ca
commit 9d12e026e8
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/IO.f90
View File

@ -210,8 +210,8 @@ subroutine IO_checkAndRewind(fileUnit)
logical :: fileOpened logical :: fileOpened
character(len=15) :: fileRead character(len=15) :: fileRead
inquire(unit=fileUnit, opened=fileOpened, read = fileRead) inquire(unit=fileUnit, opened=fileOpened, read=fileRead)
if (fileOpened .neqv. .true. .or. trim(fileRead)/='YES') call IO_error(102_pInt) if (.not. fileOpened .or. trim(fileRead)/='YES') call IO_error(102_pInt)
rewind(fileUnit) rewind(fileUnit)
end subroutine IO_checkAndRewind end subroutine IO_checkAndRewind
@ -1497,6 +1497,15 @@ subroutine IO_error(error_ID,el,ip,g,ext_msg)
case (105_pInt) case (105_pInt)
msg = 'unknown output:' msg = 'unknown output:'
!--------------------------------------------------------------------------------------------------
! lattice error messages
case (130_pInt)
msg = 'unknown lattice structure encountered'
case (131_pInt)
msg = 'hex lattice structure with invalid c/a ratio'
case (135_pInt)
msg = 'zero entry on stiffness diagonal'
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! material error messages and related messages in mesh ! material error messages and related messages in mesh
case (150_pInt) case (150_pInt)
@ -1530,20 +1539,11 @@ subroutine IO_error(error_ID,el,ip,g,ext_msg)
msg = 'unknown elasticity specified:' msg = 'unknown elasticity specified:'
case (201_pInt) case (201_pInt)
msg = 'unknown plasticity specified:' msg = 'unknown plasticity specified:'
case (205_pInt)
msg = 'unknown lattice structure encountered'
case (206_pInt)
msg = 'hex lattice structure with invalid c/a ratio'
case (210_pInt) case (210_pInt)
msg = 'unknown material parameter:' msg = 'unknown material parameter:'
case (211_pInt) case (211_pInt)
msg = 'material parameter out of bounds:' msg = 'material parameter out of bounds:'
case (214_pInt)
msg = 'stiffness parameter close to zero:'
case (252_pInt)
msg = 'nonlocal plasticity works only for direct CPFEM, i.e. one grain per integration point'
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! numerics error messages ! numerics error messages
@ -1720,6 +1720,8 @@ subroutine IO_warning(warning_ID,el,ip,g,ext_msg)
character(len=1024) :: formatString character(len=1024) :: formatString
select case (warning_ID) select case (warning_ID)
case (1_pInt)
msg = 'unknown key'
case (34_pInt) case (34_pInt)
msg = 'invalid restart increment given' msg = 'invalid restart increment given'
case (35_pInt) case (35_pInt)

8
code/lattice.f90
View File

@ -1192,7 +1192,7 @@ subroutine lattice_init
case('ort','orthorhombic') case('ort','orthorhombic')
lattice_structure(section) = LATTICE_ort_ID lattice_structure(section) = LATTICE_ort_ID
case default case default
call IO_error(450_pInt,ext_msg=trim(IO_lc(IO_stringValue(line,positions,2_pInt)))) call IO_error(130_pInt,ext_msg=trim(IO_lc(IO_stringValue(line,positions,2_pInt))))
end select end select
case ('c11') case ('c11')
lattice_C66(1,1,section) = IO_floatValue(line,positions,2_pInt) lattice_C66(1,1,section) = IO_floatValue(line,positions,2_pInt)
@ -1262,7 +1262,7 @@ subroutine lattice_init
do i = 1_pInt,Nphases do i = 1_pInt,Nphases
if ((CoverA(i) < 1.0_pReal .or. CoverA(i) > 2.0_pReal) & if ((CoverA(i) < 1.0_pReal .or. CoverA(i) > 2.0_pReal) &
.and. lattice_structure(i) == LATTICE_hex_ID) call IO_error(206_pInt) ! checking physical significance of c/a .and. lattice_structure(i) == LATTICE_hex_ID) call IO_error(131_pInt,el=i) ! checking physical significance of c/a
call lattice_initializeStructure(i, CoverA(i), aA(i), aM(i), cM(i)) call lattice_initializeStructure(i, CoverA(i), aA(i), aM(i), cM(i))
enddo enddo
@ -1340,7 +1340,7 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
lattice_C3333(1:3,1:3,1:3,1:3,myPhase) = math_Voigt66to3333(lattice_C66(1:6,1:6,myPhase)) ! Literature data is Voigt lattice_C3333(1:3,1:3,1:3,1:3,myPhase) = math_Voigt66to3333(lattice_C66(1:6,1:6,myPhase)) ! Literature data is Voigt
lattice_C66(1:6,1:6,myPhase) = math_Mandel3333to66(lattice_C3333(1:3,1:3,1:3,1:3,myPhase)) ! DAMASK uses Mandel lattice_C66(1:6,1:6,myPhase) = math_Mandel3333to66(lattice_C3333(1:3,1:3,1:3,1:3,myPhase)) ! DAMASK uses Mandel
do i = 1_pInt, 6_pInt do i = 1_pInt, 6_pInt
if (abs(lattice_C66(i,i,myPhase))<tol_math_check) call IO_warning(43_pInt,el=i,ip=myPhase) if (abs(lattice_C66(i,i,myPhase))<tol_math_check) call IO_error(135_pInt,el=i,ip=myPhase)
enddo enddo
lattice_thermalConductivity33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),& lattice_thermalConductivity33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),&
lattice_thermalConductivity33(1:3,1:3,myPhase)) lattice_thermalConductivity33(1:3,1:3,myPhase))
@ -1539,7 +1539,7 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! something went wrong ! something went wrong
case default case default
call IO_error(450_pInt,ext_msg='lattice_initializeStructure') call IO_error(130_pInt,ext_msg='lattice_initializeStructure')
end select end select