[cig-commits] [commit] master: fix: hold module info when compiling w/o adios on crays (9f7a9db)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d

On branch  : master
Link       : https://github.com/geodynamics/specfem3d/compare/2431e4583d8066767029fe42922ca847cb11487b...a87642df6becfa158c26cf7635f84f7c7fff9841

>---------------------------------------------------------------

commit 9f7a9db2a1a2779ad51e26b9c6377c8cd36bd941
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date:   Wed Aug 20 01:13:54 2014 -0400

    fix: hold module info when compiling w/o adios on crays


>---------------------------------------------------------------

9f7a9db2a1a2779ad51e26b9c6377c8cd36bd941
 flags.guess                        | 2 +-
 src/generate_databases/Makefile.in | 6 +++---
 src/meshfem3D/Makefile.in          | 6 +++---
 src/specfem3D/Makefile.in          | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flags.guess b/flags.guess
index 4986374..c1607f8 100644
--- a/flags.guess
+++ b/flags.guess
@@ -42,7 +42,7 @@ case $my_FC in
         #
         # Cray Fortran
         #
-        DEF_FFLAGS="-O3 -Onoaggress -Oipa0 -hfp2 -Ovector3 -Oscalar3 -Ocache2 -Ounroll2 -Ofusion2 -DFORCE_VECTORIZATION -p \$O" # turn on optimization; -Oaggress -Oipa4 would make it even more aggressive
+        DEF_FFLAGS="-O3 -Onoaggress -Oipa0 -hfp2 -Ovector3 -Oscalar3 -Ocache2 -Ounroll2 -Ofusion2 -DFORCE_VECTORIZATION -p \$O  -eF -em -rm" # turn on optimization; -Oaggress -Oipa4 would make it even more aggressive
         # -eC -eD -ec -en -eI -ea -g -G0  # turn on full debugging and range checking
         ;;
     pgf95|*/pgf95|pgf90|*/pgf90)
diff --git a/src/generate_databases/Makefile.in b/src/generate_databases/Makefile.in
index 3ba259f..1ac4db0 100644
--- a/src/generate_databases/Makefile.in
+++ b/src/generate_databases/Makefile.in
@@ -232,13 +232,13 @@ $O/%.adios.o: %.f90 ${SHARED}constants.h
 	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
-	${MPIFC} -c -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
 	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
diff --git a/src/meshfem3D/Makefile.in b/src/meshfem3D/Makefile.in
index d83556a..ae26746 100644
--- a/src/meshfem3D/Makefile.in
+++ b/src/meshfem3D/Makefile.in
@@ -202,13 +202,13 @@ $O/%.adios.o: %.f90 ${SHARED}constants.h
 	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
-	${MPIFC} -c -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
 	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index 4fe6320..8d6a7bc 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -430,13 +430,13 @@ $O/%.adios.o: %.f90
 	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
-	${MPIFC} -c -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
 	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<