Commit 6771d677 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

removed external_module 

not really needed, use external declarations to declare external dependencies
parent 812f9f81

sources/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ endif 
FSOURCES2=\

	drspine_parameters.f90 \

	constants_module.f90   \

	external_module.f90 \

	strings_module.f90  \

	regex_module.f90  \

	logger.f90        \

sources/Makefile.depend

+5 −6
Original line number Diff line number Diff line 
# Makefile.depend Wed 08 Sep 2021 04:40:10 PM EDT

# Makefile.depend Wed 08 Sep 2021 04:49:47 PM EDT

drspine_version.o : drspine_version.F90 drspine_parameters.o 

os_utils.o : os_utils.F90 strings_module.o drspine_parameters.o 

new_com.o : new_com.F90 os_utils.o 

drspine_parameters.o : drspine_parameters.f90 

constants_module.o : constants_module.f90 drspine_parameters.o 

external_module.o : external_module.f90 

strings_module.o : strings_module.f90 

regex_module.o : regex_module.f90 

logger.o : logger.f90 new_com.o 

getopt_m.o : getopt_m.f90 

mathutil.o : mathutil.f90 drspine_parameters.o 

statutil.o : statutil.f90 

minimization.o : minimization.f90 external_module.o logger.o drspine_parameters.o 

minimization.o : minimization.f90 logger.o drspine_parameters.o 

minpack.o : minpack.f90 

slatec.o : slatec.f90 

polynom.o : polynom.f90 external_module.o 

polynom.o : polynom.f90 

binning.o : binning.f90 logger.o mathutil.o drspine_parameters.o 

base_types.o : base_types.f90 logger.o strings_module.o drspine_parameters.o 

geometry_types.o : geometry_types.f90 base_types.o drspine_parameters.o 

data_types.o : data_types.f90 external_module.o logger.o binning.o geometry_types.o base_types.o constants_module.o drspine_parameters.o 

data_types.o : data_types.f90 logger.o binning.o geometry_types.o base_types.o constants_module.o drspine_parameters.o 

results_types.o : results_types.f90 data_types.o 

matching.o : matching.f90 geometry_types.o base_types.o data_types.o constants_module.o drspine_parameters.o 

data_manager.o : data_manager.f90 logger.o data_types.o
@@ -27,7 +26,7 @@ file_utils.o : file_utils.f90 strings_module.o drspine_parameters.o 
read_utils.o : read_utils.f90 base_types.o logger.o strings_module.o drspine_parameters.o 

texology.o : texology.f90 os_utils.o read_utils.o 

dump_data.o : dump_data.f90 file_utils.o logger.o echo_shapes.o geometry_types.o data_types.o constants_module.o drspine_version.o drspine_parameters.o 

write_utils.o : write_utils.f90 external_module.o strings_module.o constants_module.o data_types.o drspine_parameters.o 

write_utils.o : write_utils.f90 strings_module.o constants_module.o data_types.o drspine_parameters.o 

fit_utils.o : fit_utils.f90 echo_shapes.o polynom.o logger.o data_types.o drspine_parameters.o 

read_data.o : read_data.f90 binning.o logger.o file_utils.o read_utils.o instrument_config.o geometry_types.o data_types.o base_types.o constants_module.o 

fit_data.o : fit_data.f90 logger.o mathutil.o fit_utils.o dump_data.o echo_shapes.o data_types.o constants_module.o

sources/data_types.f90

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ module data_types 
  use geometry_types

  use binning

  use logger

  use external_module

  implicit none



  ! ---------------------------------------------------------------------------
@@ -2090,6 +2089,8 @@ i1: if( xhisto(i) > 0 .and. histo(i) > 0) then 


    integer,              allocatable       :: iperm(:)

    real(kind=DBL),       allocatable       :: qnom(:)

    !

    external :: DPSORT





!    dq = 0.002d0/ANGSTROEM

sources/external_module.f90

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
!> list of all external subroutines

!! to silence ifort warnings (modern Fortran)



module external_module

    implicit none



    external :: dpsort, dgeco, dgesl

    external :: lmdif, fdjac2





end module external_module

sources/minimization.f90

+5 −1
Original line number Diff line number Diff line 
module minimization

  use drspine_parameters

  use logger

  use external_module



  implicit none
@@ -78,6 +77,9 @@ contains 


    double precision                 :: wa1(npar), wa2(npar), wa3(npar)

    double precision                 :: wa4(np)

    !

    external :: lmdif, fdjac2





    wa1 = 0

    wa2 = 0
@@ -258,6 +260,7 @@ contains 


    double precision    :: tmax !, t

    integer             :: i, ier

    external            :: DPSORT



    ! make estimate
@@ -392,6 +395,7 @@ contains 
    integer          :: ipvt(n)

    double precision :: B

    integer :: j

    external :: DGECO, DGESL



    if(n==1) then

       Ainverse(1,1) = 1d0 / A(1,1)