Commit 2d1e7588 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

fixing GCC 4.8 errors

parent df9def92

sources/drspine.f90

+2 −10
Original line number Diff line number Diff line 
!! ===========================================================

!! DrSPINE MAIN PROGRAM

!! --> gitLab

!! ===========================================================
@@ -787,10 +786,8 @@ program drspine 
        call associate_roles(    trim( chrval("sample" ,"sample") ))  ! remark: here chrval should nbe able

                                                                      ! to return the contents of a quoted string

                                                                      ! TBD, check new_com version with the new datreat!



        write(*,*)"CHECK: ",trim( chrval("sample" ,"sample"))





        if(found("v") ) call print_mxx_excerpt



        call make_makro( found("edit").or.found("editor") , chrval("fitoptions"," "))
@@ -803,7 +800,7 @@ program drspine 
     !> COMMAND: parameters

     !-------------------------------------------------------------

     if(command('parameters   ',&

          ' parameters (program|instrument|reduction) [file <filename>]'//LF//&

          ' parameters (program|reduction) [file <filename>]'//LF//&

          '   - prints program parameters $')) then

        call cmd_parameters()

        cycle commandloop
@@ -2096,11 +2093,6 @@ CONTAINS 
    end if





    !if ( found('instrument') ) then

    !   write(output, nml=instrument_params)

    !end if





    if ( found('reduction') ) then

       write(output, nml=reduction_config)

    end if

sources/drspine_version.F90

+7 −12
Original line number Diff line number Diff line
@@ -17,16 +17,6 @@ module drspine_version 
  character(len=*), parameter :: VERSION_RELEASE = _VERSION_RELEASE_

  character(len=*), parameter :: BUILD_DATE = __DATE__

  character(len=*), parameter :: BUILD_TIME = __TIME__

!#if   defined(__GFORTRAN__)

!  character(len=*), parameter :: COMPILER   = "GNU Fortran"

!#elif defined(__INTEL_COMPILER)

!  character(len=*), parameter :: COMPILER   = "Intel Fortran"

!#else

!  character(len=*), parameter :: COMPILER   = "Unknown"

!#endif









contains
@@ -42,8 +32,13 @@ contains 
        if ( short_version ) return

    end if

    cresult = trim(cresult)//"-"//trim(VERSION_RELEASE)//" "//&

         "(build with "//trim(compiler_version())//" "//&

         "on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//")"

         "(build on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//" "//&

! Intel puts way too much info

#if defined(__INTEL_COMPILER)

         "with Intel(R) Fortran)"

#else

         "with "//trim(compiler_version())//")"

#endif

  end function drspine_libversion



end module drspine_version

sources/instrument_config.f90

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ module instrument_config 




  type(config_struct),target :: instrument_parameters

  namelist /instrument_params/  instrument_parameters

  !namelist /instrument_params/  instrument_parameters



contains

    subroutine configure_instrument_defaults(id, tbins, tau, qabs)