diff --git a/src/IO.f90 b/src/IO.f90 index 6c6c3b7c7..2d45a8add 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -23,7 +23,7 @@ module IO public :: & IO_init, & IO_read_ASCII, & - IO_open_file, & + IO_open_file, & ! deprecated, use IO_read_ASCII IO_open_jobFile_binary, & IO_isBlank, & IO_getTag, & @@ -44,8 +44,7 @@ module IO IO_countDataLines #elif defined(Marc4DAMASK) IO_fixedNoEFloatValue, & - IO_fixedIntValue, & - IO_countNumericalDataLines + IO_fixedIntValue #endif #endif @@ -549,14 +548,8 @@ subroutine IO_error(error_ID,el,ip,g,instance,ext_msg) msg = 'could not read file:' case (103) msg = 'could not assemble input files' - case (104) - msg = '{input} recursion limit reached' - case (105) - msg = 'unknown output:' case (106) msg = 'working directory does not exist:' - case (107) - msg = 'line length exceeds limit of 256' !-------------------------------------------------------------------------------------------------- ! lattice error messages @@ -923,38 +916,6 @@ end function IO_countDataLines #endif -#ifdef Marc4DAMASK -!-------------------------------------------------------------------------------------------------- -!> @brief count lines containig data up to next *keyword -!-------------------------------------------------------------------------------------------------- -integer function IO_countNumericalDataLines(fileUnit) - - integer, intent(in) :: fileUnit !< file handle - - - integer, allocatable, dimension(:) :: chunkPos - character(len=pStringLen) :: line, & - tmp - - IO_countNumericalDataLines = 0 - line = '' - - do while (trim(line) /= IO_EOF) - line = IO_read(fileUnit) - chunkPos = IO_stringPos(line) - tmp = IO_lc(IO_stringValue(line,chunkPos,1)) - if (verify(trim(tmp),'0123456789') == 0) then ! numerical values - IO_countNumericalDataLines = IO_countNumericalDataLines + 1 - else - exit - endif - enddo - backspace(fileUnit) - -end function IO_countNumericalDataLines -#endif - - !-------------------------------------------------------------------------------------------------- !> @brief count items in consecutive lines depending on lines !> @details Marc: ints concatenated by "c" as last char or range of values a "to" b diff --git a/src/mesh_marc.f90 b/src/mesh_marc.f90 index 1d7fd09c3..00fd76326 100644 --- a/src/mesh_marc.f90 +++ b/src/mesh_marc.f90 @@ -488,8 +488,7 @@ subroutine inputRead_mapNodes(fileContent) chunkPos = IO_stringPos(fileContent(l)) if( IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'coordinates' ) then do i = 1,size(mesh_mapFEtoCPnode,2) - mesh_mapFEtoCPnode(1,i) = IO_fixedIntValue (fileContent(l+1+i),[0,10],1) - mesh_mapFEtoCPnode(2,i) = i + mesh_mapFEtoCPnode(1:2,i) = [IO_fixedIntValue (fileContent(l+1+i),[0,10],1),i] ! ToDo: use IO_intValue enddo exit endif @@ -520,9 +519,9 @@ subroutine inputRead_elemNodes(nodes, & chunkPos = IO_stringPos(fileContent(l)) if( IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'coordinates' ) then do i=1,nNode - m = mesh_FEasCP('node',IO_fixedIntValue(fileContent(l+1+i),node_ends,1)) + m = mesh_FEasCP('node',IO_fixedIntValue(fileContent(l+1+i),node_ends,1)) !ToDo: use IO_intValue do j = 1,3 - nodes(j,m) = mesh_unitlength * IO_fixedNoEFloatValue(fileContent(l+1+i),node_ends,j+1) + nodes(j,m) = mesh_unitlength * IO_fixedNoEFloatValue(fileContent(l+1+i),node_ends,j+1) !ToDo: use IO_floatValue enddo enddo exit