Skip to content

Commit

Permalink
Merge branch 'Marc-use-IO' into 'development'
Browse files Browse the repository at this point in the history
avoid duplicate lc function

See merge request damask/DAMASK!780
  • Loading branch information
FranzRoters committed Jul 19, 2023
2 parents 5bd9531 + d88b2e7 commit bfc2a76
Showing 1 changed file with 11 additions and 31 deletions.
42 changes: 11 additions & 31 deletions src/Marc/DAMASK_Marc.f90
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,24 @@
#endif

#include "../prec.f90"
#include "../parallelization.f90"
#include "../constants.f90"
#include "../misc.f90"
#include "../IO.f90"
#include "../YAML_types.f90"
#include "../YAML_parse.f90"
#include "../HDF5_utilities.f90"

module DAMASK_interface
use prec
use, intrinsic :: ISO_fortran_env, only: &
compiler_version, &
compiler_options
use ifport, only: &
CHDIR

use prec
use IO

implicit none(type,external)
private

Expand Down Expand Up @@ -105,7 +114,7 @@ logical function solverIsSymmetric()
status='old', position='rewind', action='read',iostat=myStat)
do
read (fileUnit,'(A)',END=100) line
if (index(trim(lc(line)),'solver') == 1) then
if (index(trim(IO_lc(line)),'solver') == 1) then
read (fileUnit,'(A)',END=100) line ! next line
s = verify(line, ' ') ! start of first chunk
s = s + verify(line(s+1:),' ') ! start of second chunk
Expand All @@ -114,40 +123,11 @@ logical function solverIsSymmetric()
end if
end do
100 close(fileUnit)
contains

!--------------------------------------------------------------------------------------------------
!> @brief changes characters in string to lower case
!> @details copied from IO_lc
!--------------------------------------------------------------------------------------------------
function lc(string)

character(len=*), intent(in) :: string !< string to convert
character(len=len(string)) :: lc

character(26), parameter :: LOWER = 'abcdefghijklmnopqrstuvwxyz'
character(26), parameter :: UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'

integer :: i,n

do i=1,len(string)
lc(i:i) = string(i:i)
n = index(UPPER,lc(i:i))
if (n/=0) lc(i:i) = LOWER(n:n)
end do
end function lc

end function solverIsSymmetric

end module DAMASK_interface

#include "../parallelization.f90"
#include "../constants.f90"
#include "../misc.f90"
#include "../IO.f90"
#include "../YAML_types.f90"
#include "../YAML_parse.f90"
#include "../HDF5_utilities.f90"
#include "../result.f90"
#include "../config.f90"
#include "../LAPACK_interface.f90"
Expand Down

0 comments on commit bfc2a76

Please sign in to comment.