diff --git a/src/IO.f90 b/src/IO.f90 index d2b1017e1..244d34845 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -357,10 +357,10 @@ end function IO_stringAsBool !-------------------------------------------------------------------------------------------------- !> @brief Write error statements to standard out and terminate the run with exit #9xxx !-------------------------------------------------------------------------------------------------- -subroutine IO_error(error_ID,el,ip,ext_msg) +subroutine IO_error(error_ID,el,ext_msg) integer, intent(in) :: error_ID - integer, optional, intent(in) :: el,ip + integer, optional, intent(in) :: el character(len=*), optional, intent(in) :: ext_msg external :: quit @@ -562,8 +562,6 @@ subroutine IO_error(error_ID,el,ip,ext_msg) endif if (present(el)) & write(IO_STDERR,'(a19,1x,i9,44x,a3)') ' │ at element ',el, '│' - if (present(ip)) & - write(IO_STDERR,'(a19,1x,i9,44x,a3)') ' │ at IP ',ip, '│' write(IO_STDERR,'(a,69x,a)') ' │', '│' write(IO_STDERR,'(a)') ' └'//IO_DIVIDER//'┘' flush(IO_STDERR) @@ -585,6 +583,7 @@ subroutine IO_warning(warning_ID,el,ip,ext_msg) character(len=:), allocatable :: msg character(len=pStringLen) :: formatString + select case (warning_ID) case (47) msg = 'invalid parameter for FFTW, using FFTW_PATIENT' diff --git a/src/Marc/discretization_Marc.f90 b/src/Marc/discretization_Marc.f90 index c1525b05e..10d7ca46a 100644 --- a/src/Marc/discretization_Marc.f90 +++ b/src/Marc/discretization_Marc.f90 @@ -594,7 +594,7 @@ subroutine inputRead_elemType(elem, & t = mapElemtype(IO_stringValue(fileContent(l+1+i+j),chunkPos,2)) call elem%init(t) else - if (t /= mapElemtype(IO_stringValue(fileContent(l+1+i+j),chunkPos,2))) call IO_error(191,el=t,ip=i) + if (t /= mapElemtype(IO_stringValue(fileContent(l+1+i+j),chunkPos,2))) call IO_error(191,el=t) endif remainingChunks = elem%nNodes - (chunkPos(1) - 2) do while(remainingChunks > 0) @@ -616,6 +616,7 @@ subroutine inputRead_elemType(elem, & character(len=*), intent(in) :: what + select case (IO_lc(what)) case ( '6') mapElemtype = 1 ! Two-dimensional Plane Strain Triangle