[cig-commits] r19233 - in seismo/3D/SPECFEM3D_GLOBE/trunk: . src/auxiliaries src/create_header_file src/meshfem3D src/specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Mon Nov 21 16:39:41 PST 2011
Author: dkomati1
Date: 2011-11-21 16:39:41 -0800 (Mon, 21 Nov 2011)
New Revision: 19233
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/configure
seismo/3D/SPECFEM3D_GLOBE/trunk/flags.guess
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/write_output_SAC.f90
Log:
committed the modifications made by Laurent Leger at IDRIS (France) in order to compile on an IBM BlueGene
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/configure
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/configure 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/configure 2011-11-22 00:39:41 UTC (rev 19233)
@@ -601,6 +601,9 @@
FLAGS_CHECK
MPILIBS
MPIFC
+AR
+ARFLAGS
+RANLIB
EGREP
GREP
CPP
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/flags.guess
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/flags.guess 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/flags.guess 2011-11-22 00:39:41 UTC (rev 19233)
@@ -177,9 +177,11 @@
#
if test x"$FLAGS_NO_CHECK" = x; then
# deleted -qxflag=dvz because it requires handler function __xl_dzx and thus linking will fail
- FLAGS_NO_CHECK="-O3 -qsave -qstrict -q64 -qtune=auto -qarch=auto -qcache=auto -qfree=f90 -qsuffix=f=f90 -qhalt=w -qlanglvl=90pure -qsuppress=1518-317 -qflttrap=overflow:zerodivide:invalid:enable -qfloat=nans -qinitauto=7FBFFFFF -Q -Q+rank,swap_all"
- # on MareNostrum at the Barcelona SuperComputing Center (Spain) one can use
+ FLAGS_NO_CHECK="-O3 -qsave -qstrict -q64 -qtune=auto -qarch=auto -qcache=auto -qfree=f90 -qsuffix=f=f90 -qhalt=w -qlanglvl=90pure -qsuppress=1518-317 -qflttrap=overflow:zerodivide:invalid:enable -qfloat=nans -qinitauto=7FBFFFFF -Q -Q+rank,swap_all -Wl,-relax"
+ # on "MareNostrum" IBM at the Barcelona SuperComputing Center (Spain) use:
# -qtune=ppc970 -qarch=ppc64v instead of -qtune=auto -qarch=auto
+ # on "Babel" IBM BlueGene at IDRIS (France) use:
+ # -qtune=auto -qarch=450d instead of -qtune=auto -qarch=auto
fi
if test x"$FLAGS_CHECK" = x; then
#
@@ -222,4 +224,14 @@
echo FLAGS_NO_CHECK=\"$FLAGS_NO_CHECK\" | sed 's/\$/\\\$/g'
echo FCENV=\"$FCENV\" | sed 's/\$/\\\$/g'
+# added by DK to make the IDRIS modifications below work
+AR="ar"
+RANLIB="ranlib"
+ARFLAGS="cru"
+
+# Added by IDRIS to crosscompile on BlueGene/P.
+echo AR=\"$AR\" | sed 's/\$/\\\$/g'
+echo ARFLAGS=\"$ARFLAGS\" | sed 's/\$/\\\$/g'
+echo RANLIB=\"$RANLIB\" | sed 's/\$/\\\$/g'
+
# end of file
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile.in 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile.in 2011-11-22 00:39:41 UTC (rev 19233)
@@ -44,9 +44,12 @@
CFLAGS = @CFLAGS@
CPPFLAGS = -I../../setup @CPPFLAGS@
-AR = ar
-ARFLAGS = cru
-RANLIB = ranlib
+#AR = ar
+#ARFLAGS = cru
+#RANLIB = ranlib
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+RANLIB = @RANLIB@
## compilation directories
# E : executables directory
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile.in 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile.in 2011-11-22 00:39:41 UTC (rev 19233)
@@ -44,9 +44,12 @@
CFLAGS = @CFLAGS@
CPPFLAGS = -I../../setup @CPPFLAGS@
-AR = ar
-ARFLAGS = cru
-RANLIB = ranlib
+#AR = ar
+#ARFLAGS = cru
+#RANLIB = ranlib
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+RANLIB = @RANLIB@
## compilation directories
# E : executables directory
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile.in 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile.in 2011-11-22 00:39:41 UTC (rev 19233)
@@ -44,9 +44,12 @@
CFLAGS = @CFLAGS@
CPPFLAGS = -I../../setup @CPPFLAGS@
-AR = ar
-ARFLAGS = cru
-RANLIB = ranlib
+#AR = ar
+#ARFLAGS = cru
+#RANLIB = ranlib
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+RANLIB = @RANLIB@
## compilation directories
# E : executables directory
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile.in 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile.in 2011-11-22 00:39:41 UTC (rev 19233)
@@ -44,9 +44,12 @@
CFLAGS = @CFLAGS@
CPPFLAGS = -I../../setup @CPPFLAGS@
-AR = ar
-ARFLAGS = cru
-RANLIB = ranlib
+#AR = ar
+#ARFLAGS = cru
+#RANLIB = ranlib
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+RANLIB = @RANLIB@
## compilation directories
# E : executables directory
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/write_output_SAC.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/write_output_SAC.f90 2011-11-21 23:32:16 UTC (rev 19232)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/write_output_SAC.f90 2011-11-22 00:39:41 UTC (rev 19233)
@@ -74,6 +74,7 @@
logical OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY
real(kind=CUSTOM_REAL) phi
+ double precision :: phi_dble
! local parameters
integer time_sec,isample
@@ -251,10 +252,11 @@
CMPAZ = 0.00
CMPINC = 0.00
else if(iorientation == 4) then !R
- CMPAZ = modulo(phi,360.) ! phi is calculated above (see call distaz())
+ phi_dble = phi
+ CMPAZ = sngl(modulo(phi_dble,360.d0)) ! phi is calculated above (see call distaz())
CMPINC =90.00
else if(iorientation == 5) then !T
- CMPAZ = modulo(phi+90.,360.) ! phi is calculated above (see call distaz())
+ CMPAZ = sngl(modulo(phi_dble+90.d0,360.d0)) ! phi is calculated above (see call distaz())
CMPINC =90.00
endif
!----------------end format G15.7--------
More information about the CIG-COMMITS
mailing list