[cig-commits] [commit] devel: Fix ifort 13 bug with constants module. (85b1db7)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon May 26 05:40:37 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/2696d80a7675a7c5a89fec3acdc11ca82439a18f...1a2f0a3f482f155db8320c64b4eae070bba090a2
>---------------------------------------------------------------
commit 85b1db7a5972aadc5923c98fcf325fbb306d113a
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat May 24 19:08:56 2014 -0400
Fix ifort 13 bug with constants module.
Switch from constants module back to constants header in MPI code. It
seems that ifort 13 has a bug when parsing this file with so many uses
of the constants module. ifort 12 and ifort 14 do not exhibit this bug.
>---------------------------------------------------------------
85b1db7a5972aadc5923c98fcf325fbb306d113a
src/shared/parallel.f90 | 44 ++++++++++++++++++++++----------------------
src/shared/rules.mk | 2 +-
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/shared/parallel.f90 b/src/shared/parallel.f90
index 3bfed4a..e4d1191 100644
--- a/src/shared/parallel.f90
+++ b/src/shared/parallel.f90
@@ -99,11 +99,11 @@
subroutine bcast_all_cr(buffer, countval)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer countval
@@ -140,11 +140,11 @@
subroutine bcast_all_r(buffer, countval)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer countval
@@ -231,11 +231,11 @@
subroutine gather_all_cr(sendbuf, sendcnt, recvbuf, recvcount, NPROC)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcnt, recvcount, NPROC
@@ -256,11 +256,11 @@
subroutine gather_all_all_cr(sendbuf, recvbuf, counts, NPROC)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer NPROC,counts
@@ -280,11 +280,11 @@
subroutine gatherv_all_cr(sendbuf, sendcnt, recvbuf, recvcount, recvoffset,recvcounttot, NPROC)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcnt,recvcounttot,NPROC
@@ -410,11 +410,11 @@
subroutine max_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL) sendbuf, recvbuf
@@ -431,11 +431,11 @@
subroutine min_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL) sendbuf, recvbuf
@@ -453,11 +453,11 @@
subroutine min_all_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL):: sendbuf, recvbuf
@@ -475,11 +475,11 @@
!
! subroutine min_all_all_dp(sendbuf, recvbuf)
!
-! use constants
! use mpi
!
! implicit none
!
+! include "constants.h"
! include "precision.h"
!
! double precision :: sendbuf, recvbuf
@@ -496,11 +496,11 @@
subroutine max_all_i(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer :: sendbuf, recvbuf
@@ -545,11 +545,11 @@
subroutine max_all_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL):: sendbuf, recvbuf
@@ -568,11 +568,11 @@
subroutine max_all_all_dp(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
double precision :: sendbuf, recvbuf
@@ -590,11 +590,11 @@
subroutine min_all_i(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer:: sendbuf, recvbuf
@@ -649,11 +649,11 @@
subroutine sum_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL) sendbuf, recvbuf
@@ -670,11 +670,11 @@
subroutine sum_all_all_cr(sendbuf, recvbuf)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
real(kind=CUSTOM_REAL) sendbuf, recvbuf
@@ -746,11 +746,11 @@
subroutine sendrecv_all_cr(sendbuf, sendcount, dest, sendtag, &
recvbuf, recvcount, source, recvtag)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcount, recvcount, dest, sendtag, source, recvtag
@@ -785,11 +785,11 @@
subroutine isend_cr(sendbuf, sendcount, dest, sendtag, req)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcount, dest, sendtag, req
@@ -808,11 +808,11 @@
subroutine irecv_cr(recvbuf, recvcount, dest, recvtag, req)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer recvcount, dest, recvtag, req
@@ -831,11 +831,11 @@
subroutine isend_i(sendbuf, sendcount, dest, sendtag, req)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcount, dest, sendtag, req
@@ -854,11 +854,11 @@
subroutine irecv_i(recvbuf, recvcount, dest, recvtag, req)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer recvcount, dest, recvtag, req
@@ -898,11 +898,11 @@
subroutine recvv_cr(recvbuf, recvcount, dest, recvtag )
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer recvcount,dest,recvtag
@@ -1060,11 +1060,11 @@
subroutine sendv_cr(sendbuf, sendcount, dest, sendtag)
- use constants
use mpi
implicit none
+ include "constants.h"
include "precision.h"
integer sendcount,dest,sendtag
diff --git a/src/shared/rules.mk b/src/shared/rules.mk
index ca805f6..75e9d26 100644
--- a/src/shared/rules.mk
+++ b/src/shared/rules.mk
@@ -142,7 +142,7 @@ $O/%.shared.o: $S/%.f90 $O/constants_mod.shared_module.o
$O/%.shared.o: $S/%.F90 $O/constants_mod.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.sharedmpi.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
More information about the CIG-COMMITS
mailing list