From 898c19421994edb632fb16d3e82735d8275d5477 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 21 Dec 2018 00:45:50 +0100 Subject: [PATCH] config files --- TODO | 1 - config/gfortran.cfg | 6 +-- config/gfortran_avx.cfg | 6 +-- config/gfortran_debug.cfg | 6 +-- config/gfortran_mpi.cfg | 6 +-- config/ifort.cfg | 4 +- config/ifort_debug.cfg | 6 +-- config/ifort_mpi.cfg | 6 +-- src/nuclei/nuclei.irp.f | 3 +- src/utils/need.irp.f | 83 --------------------------------------- 10 files changed, 22 insertions(+), 105 deletions(-) diff --git a/TODO b/TODO index 0e77a626..04c504fa 100644 --- a/TODO +++ b/TODO @@ -49,7 +49,6 @@ * Examples : subroutine example_module * Config file for Cray -* Implicit none obligatoire * EZFIO sans fork diff --git a/config/gfortran.cfg b/config/gfortran.cfg index ff7f5624..a15cf1c7 100644 --- a/config/gfortran.cfg +++ b/config/gfortran.cfg @@ -35,14 +35,14 @@ OPENMP : 1 ; Append OpenMP flags # -ffast-math and the Fortran-specific # -fno-protect-parens and -fstack-arrays. [OPT] -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Profiling flags ################# # [PROFILE] FC : -p -g -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Debugging flags ################# @@ -51,7 +51,7 @@ FCFLAGS : -Ofast -fimplicit-none # -g : Extra debugging information # [DEBUG] -FCFLAGS : -fcheck=all -g -fimplicit-none +FCFLAGS : -fcheck=all -g # OpenMP flags ################# diff --git a/config/gfortran_avx.cfg b/config/gfortran_avx.cfg index 0d9506fe..6d5186fa 100644 --- a/config/gfortran_avx.cfg +++ b/config/gfortran_avx.cfg @@ -35,14 +35,14 @@ OPENMP : 1 ; Append OpenMP flags # -ffast-math and the Fortran-specific # -fno-protect-parens and -fstack-arrays. [OPT] -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Profiling flags ################# # [PROFILE] FC : -p -g -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Debugging flags ################# @@ -51,7 +51,7 @@ FCFLAGS : -Ofast -fimplicit-none # -g : Extra debugging information # [DEBUG] -FCFLAGS : -fcheck=all -g -fimplicit-none +FCFLAGS : -fcheck=all -g # OpenMP flags ################# diff --git a/config/gfortran_debug.cfg b/config/gfortran_debug.cfg index 3956c890..29fad278 100644 --- a/config/gfortran_debug.cfg +++ b/config/gfortran_debug.cfg @@ -35,14 +35,14 @@ OPENMP : 1 ; Append OpenMP flags # -ffast-math and the Fortran-specific # -fno-protect-parens and -fstack-arrays. [OPT] -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Profiling flags ################# # [PROFILE] FC : -p -g -FCFLAGS : -Ofast -fimplicit-none +FCFLAGS : -Ofast # Debugging flags ################# @@ -51,7 +51,7 @@ FCFLAGS : -Ofast -fimplicit-none # -g : Extra debugging information # [DEBUG] -FCFLAGS : -g -msse4.2 -fcheck=all -Waliasing -Wampersand -Wconversion -Wsurprising -Wintrinsics-std -Wno-tabs -Wintrinsic-shadow -Wline-truncation -Wreal-q-constant -fimplicit-none +FCFLAGS : -g -msse4.2 -fcheck=all -Waliasing -Wampersand -Wconversion -Wsurprising -Wintrinsics-std -Wno-tabs -Wintrinsic-shadow -Wline-truncation -Wreal-q-constant # OpenMP flags ################# diff --git a/config/gfortran_mpi.cfg b/config/gfortran_mpi.cfg index b9a5a14b..2dc4851e 100644 --- a/config/gfortran_mpi.cfg +++ b/config/gfortran_mpi.cfg @@ -35,14 +35,14 @@ OPENMP : 1 ; Append OpenMP flags # -ffast-math and the Fortran-specific # -fno-protect-parens and -fstack-arrays. [OPT] -FCFLAGS : -Ofast -msse4.2 -fimplicit-none +FCFLAGS : -Ofast -msse4.2 # Profiling flags ################# # [PROFILE] FC : -p -g -FCFLAGS : -Ofast -msse4.2 -fimplicit-none +FCFLAGS : -Ofast -msse4.2 # Debugging flags ################# @@ -51,7 +51,7 @@ FCFLAGS : -Ofast -msse4.2 -fimplicit-none # -g : Extra debugging information # [DEBUG] -FCFLAGS : -fcheck=all -g -fimplicit-none +FCFLAGS : -fcheck=all -g # OpenMP flags ################# diff --git a/config/ifort.cfg b/config/ifort.cfg index 07ebdf93..72a3406f 100644 --- a/config/ifort.cfg +++ b/config/ifort.cfg @@ -32,14 +32,14 @@ OPENMP : 1 ; Append OpenMP flags # [OPT] FC : -traceback -FCFLAGS : -xAVX -O2 -ip -ftz -g -implicitnone +FCFLAGS : -xAVX -O2 -ip -ftz -g # Profiling flags ################# # [PROFILE] FC : -p -g -FCFLAGS : -xSSE4.2 -O2 -ip -ftz -implicitnone +FCFLAGS : -xSSE4.2 -O2 -ip -ftz # Debugging flags ################# diff --git a/config/ifort_debug.cfg b/config/ifort_debug.cfg index f0bd4267..eeb4730e 100644 --- a/config/ifort_debug.cfg +++ b/config/ifort_debug.cfg @@ -32,7 +32,7 @@ OPENMP : 1 ; Append OpenMP flags # [OPT] FC : -traceback -FCFLAGS : -xAVX -O2 -ip -ftz -g -fimplicit-none +FCFLAGS : -xAVX -O2 -ip -ftz -g # Profiling flags @@ -40,7 +40,7 @@ FCFLAGS : -xAVX -O2 -ip -ftz -g -fimplicit-none # [PROFILE] FC : -p -g -FCFLAGS : -xSSE4.2 -O2 -ip -ftz -fimplicit-none +FCFLAGS : -xSSE4.2 -O2 -ip -ftz # Debugging flags @@ -54,7 +54,7 @@ FCFLAGS : -xSSE4.2 -O2 -ip -ftz -fimplicit-none # [DEBUG] FC : -g -traceback -FCFLAGS : -xSSE4.2 -C -fpe0 -fimplicit-none +FCFLAGS : -xSSE4.2 -C -fpe0 -implicitnone # OpenMP flags diff --git a/config/ifort_mpi.cfg b/config/ifort_mpi.cfg index ff71415f..9e965a96 100644 --- a/config/ifort_mpi.cfg +++ b/config/ifort_mpi.cfg @@ -31,7 +31,7 @@ OPENMP : 1 ; Append OpenMP flags # -ftz : Flushes denormal results to zero # [OPT] -FCFLAGS : -xSSE4.2 -O2 -ip -ftz -g -traceback -fimplicit-none +FCFLAGS : -xSSE4.2 -O2 -ip -ftz -g -traceback # !xAVX # Profiling flags @@ -39,7 +39,7 @@ FCFLAGS : -xSSE4.2 -O2 -ip -ftz -g -traceback -fimplicit-none # [PROFILE] FC : -p -g -FCFLAGS : -xSSE4.2 -O2 -ip -ftz -fimplicit-none +FCFLAGS : -xSSE4.2 -O2 -ip -ftz # Debugging flags @@ -53,7 +53,7 @@ FCFLAGS : -xSSE4.2 -O2 -ip -ftz -fimplicit-none # [DEBUG] FC : -g -traceback -FCFLAGS : -xSSE2 -C -fpe0 -fimplicit-none +FCFLAGS : -xSSE2 -C -fpe0 -implicitnone # OpenMP flags diff --git a/src/nuclei/nuclei.irp.f b/src/nuclei/nuclei.irp.f index e9130d13..a343374a 100644 --- a/src/nuclei/nuclei.irp.f +++ b/src/nuclei/nuclei.irp.f @@ -207,10 +207,11 @@ END_PROVIDER BEGIN_PROVIDER [ character*(4), element_name, (0:127)] &BEGIN_PROVIDER [ double precision, element_mass, (0:127) ] + implicit none BEGIN_DOC ! Array of the name of element, sorted by nuclear charge (integer) END_DOC - integer :: iunit + integer :: iunit, i integer, external :: getUnitAndOpen character*(128) :: filename if (mpi_master) then diff --git a/src/utils/need.irp.f b/src/utils/need.irp.f index b8afe6b3..6a42d228 100644 --- a/src/utils/need.irp.f +++ b/src/utils/need.irp.f @@ -46,7 +46,6 @@ double precision function rinteg(n,u) implicit double precision(a-h,o-z) include 'constants.include.F' -! pi=dacos(-1.d0) ichange=1 factor=1.d0 if(u.lt.0.d0)then @@ -92,15 +91,6 @@ end -! -! -! -! -! -! -! -! double precision function erf0(x) implicit double precision (a-h,o-z) if(x.lt.0.d0)then @@ -111,24 +101,6 @@ end -! -! -! -! -! -! -! -! -! -! -! -! gcf -! gser -! -! -! double precision function gammp(a,x) implicit double precision (a-h,o-z) if(x.lt.0..or.a.le.0.)stop 'error in gammp' @@ -140,29 +112,8 @@ endif return end -! -! -! -! -! -! -! -! -! -! -! -! -! -! gammp -! -! -! subroutine gser(gamser,a,x,gln) implicit double precision (a-h,o-z) parameter (itmax=100,eps=3.e-7) @@ -185,28 +136,7 @@ 1 gamser=sum*exp(-x+a*log(x)-gln) return end -! -! -! -! -! -! -! -! -! -! -! -! -! -! gammp -! -! -! subroutine gcf(gammcf,a,x,gln) implicit double precision (a-h,o-z) parameter (itmax=100,eps=3.e-7) @@ -237,8 +167,6 @@ return end -! -! double precision function ddfact2(n) implicit double precision(a-h,o-z) if(iand(n,1).eq.0)stop 'error in ddfact2' @@ -258,15 +186,6 @@ b_coef=-0.5d0*u**(n+1)*dexp(-u**2) end -! -! -! -! -! -! -! -! double precision function gammln(xx) implicit double precision (a-h,o-z) real*8 cof(6),stp,half,one,fpf,x,tmp,ser @@ -284,5 +203,3 @@ gammln=tmp+log(stp*ser) return end -! -!