[cig-commits] r22931 - in seismo/3D/SPECFEM3D_GLOBE/trunk: . src/specfem3D

elliott.sales.de.andrade at geodynamics.org elliott.sales.de.andrade at geodynamics.org
Mon Oct 7 14:56:17 PDT 2013 

Author: elliott.sales.de.andrade
Date: 2013-10-07 14:56:17 -0700 (Mon, 07 Oct 2013)
New Revision: 22931

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in
   seismo/3D/SPECFEM3D_GLOBE/trunk/configure
   seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
Log:
build: Fixup many minor merge issues.

* Remove unnecessary and incorrect rm -rf.
* Remove AR, ARFLAGS, RANLIB again.
* Remove _NO_CHECK variables again.
* Remove totally unnecessary touch call.
* Remove old line referring to static library.

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in	2013-10-07 21:56:11 UTC (rev 22930)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in	2013-10-07 21:56:17 UTC (rev 22931)
@@ -35,7 +35,6 @@
 MPILIBS = @MPILIBS@
 
 FLAGS_CHECK = @FLAGS_CHECK@
-#FLAGS_NO_CHECK = @FLAGS_NO_CHECK@
 
 FCFLAGS_f90 = @FCFLAGS_f90@ -I at top_builddir@ -I${SETUP}
 
@@ -43,10 +42,8 @@
 FC_MODDIR = @FC_MODDIR@
  
 FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK)
-#FCCOMPILE_NO_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_NO_CHECK)
 
 MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK)
-#MPIFCCOMPILE_NO_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_NO_CHECK)
 
 CC = @CC@
 CFLAGS = @CFLAGS@
@@ -138,9 +135,7 @@
 
 #@COND_VTK_TRUE at CPPFLAGS += $(VTK_FLAG)
 #@COND_VTK_TRUE at FCCOMPILE_CHECK += $(VTK_FLAG)
-##@COND_VTK_TRUE at FCCOMPILE_NO_CHECK += $(VTK_FLAG)
 #@COND_VTK_TRUE at MPIFCCOMPILE_CHECK += $(VTK_FLAG)
-##@COND_VTK_TRUE at MPIFCCOMPILE_NO_CHECK += $(VTK_FLAG)
 
 @COND_VTK_TRUE at MPILIBS += $(VTK_LINK)
 
@@ -190,9 +185,7 @@
 
 #@COND_VECTORIZATION_TRUE at CPPFLAGS += $(VEC_FLAG)
 #@COND_VECTORIZATION_TRUE at FCCOMPILE_CHECK += $(VEC_FLAG)
-##@COND_VECTORIZATION_TRUE at FCCOMPILE_NO_CHECK += $(VEC_FLAG)
 #@COND_VECTORIZATION_TRUE at MPIFCCOMPILE_CHECK += $(VEC_FLAG)
-##@COND_VECTORIZATION_TRUE at MPIFCCOMPILE_NO_CHECK += $(VEC_FLAG)
 
 
 
@@ -250,7 +243,7 @@
 
 all: default
 
-default: change_date_of_calling_code $(DEFAULT)
+default: $(DEFAULT)
 
 required: bin obj
 
@@ -263,19 +256,14 @@
 backup:
 	cp -rp src setup DATA/Par_file* Makefile go_mesher* go_solver* mymachines bak
 
-change_date_of_calling_code:
-	touch src/specfem3D/specfem3D.F90
-
 ifdef CLEAN
 clean:
 	@echo "cleaning by CLEAN defined"
 	-rm -f $(foreach dir, $(CLEAN), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_SHARED_OBJECTS) $($(dir)_TARGETS))
-	(rm -rf bin obj )
 else
 clean:
 	@echo "cleaning by CLEAN not defined"
 	-rm -f $(foreach dir, $(SUBDIRS), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_TARGETS))
-	(rm -rf bin obj )
 endif
 
 help:

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/configure
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/configure	2013-10-07 21:56:11 UTC (rev 22930)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/configure	2013-10-07 21:56:17 UTC (rev 22931)
@@ -632,16 +632,12 @@
 NVCC
 CONFIGURE_FLAGS
 LOCAL_PATH_IS_ALSO_GLOBAL
-RANLIB
-ARFLAGS
-AR
 CUDA_INC
 CUDA_LIB
 ADIOS_LIB
 ADIOS_INC
 MXML_LIB
 MXML_INC
-FLAGS_NO_CHECK
 FLAGS_CHECK
 MPI_INC
 MPILIBS
@@ -744,16 +740,12 @@
 MPILIBS
 MPI_INC
 FLAGS_CHECK
-FLAGS_NO_CHECK
 MXML_INC
 MXML_LIB
 ADIOS_INC
 ADIOS_LIB
 CUDA_LIB
 CUDA_INC
-AR
-ARFLAGS
-RANLIB
 LOCAL_PATH_IS_ALSO_GLOBAL'
 
 
@@ -1396,18 +1388,12 @@
   MPI_INC     Directory where MPI include file mpi.h is installed, which is
               needed by ADIOS/CUDA when compiling
   FLAGS_CHECK Fortran compiler flags for non-critical subroutines
-  FLAGS_NO_CHECK
-              Fortran compiler flags for creating fast, production-run code
-              for critical subroutines
   MXML_INC    Directory where MXML headers are installed
   MXML_LIB    Directory where MXML libraries are installed
   ADIOS_INC   Directory where ADIOS headers are installed
   ADIOS_LIB   Directory where ADIOS libraries are installed
   CUDA_LIB    Directory where CUDA library libcudart is installed
   CUDA_INC    Directory where CUDA include files are installed
-  AR          ar library creation
-  ARFLAGS     ar flag library creation
-  RANLIB      ranlib library creation
   LOCAL_PATH_IS_ALSO_GLOBAL
               files on a local path on each node are also seen as global with
               same path [default=true]
@@ -5295,7 +5281,6 @@
   CPPFLAGS+=" $MPI_INC"
   FCFLAGS+=" $MPI_INC"
   FLAGS_CHECK+=" $MPI_INC"
-  FLAGS_NO_CHECK+=" $MPI_INC"
 
 fi
 
@@ -5445,7 +5430,6 @@
     CPPFLAGS+=" $ADIOS_INC"
     FCFLAGS+=" $ADIOS_INC"
     FLAGS_CHECK+=" $ADIOS_INC"
-    FLAGS_NO_CHECK+=" $ADIOS_INC"
 
 fi
   if test x"$ADIOS_LIB" != x; then :
@@ -5655,7 +5639,6 @@
    ;;
 esac
   FLAGS_CHECK+=" $VEC_FLAG"
-  FLAGS_NO_CHECK+=" $VEC_FLAG"
   # c compiler
   case $CC in #(
   # ibm compiler flag
@@ -5695,7 +5678,6 @@
    ;;
 esac
   FLAGS_CHECK+=" $VTK_FLAG"
-  FLAGS_NO_CHECK+=" $VTK_FLAG"
   # c compiler
   case $CC in #(
   # ibm compiler flag

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac	2013-10-07 21:56:11 UTC (rev 22930)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac	2013-10-07 21:56:17 UTC (rev 22931)
@@ -134,7 +134,6 @@
 AC_ARG_VAR(MPI_INC,[Directory where MPI include file mpi.h is installed, which is needed by ADIOS/CUDA when compiling])
 
 AC_ARG_VAR(FLAGS_CHECK, [Fortran compiler flags for non-critical subroutines])
-AC_ARG_VAR(FLAGS_NO_CHECK, [Fortran compiler flags for creating fast, production-run code for critical subroutines])
 
 # adios
 AC_ARG_VAR(MXML_INC, [Directory where MXML headers are installed])
@@ -146,10 +145,6 @@
 AC_ARG_VAR(CUDA_LIB,[Directory where CUDA library libcudart is installed])
 AC_ARG_VAR(CUDA_INC,[Directory where CUDA include files are installed])
 
-AC_ARG_VAR(AR, [ar library creation])
-AC_ARG_VAR(ARFLAGS, [ar flag library creation])
-AC_ARG_VAR(RANLIB, [ranlib library creation])
-
 # scratch disks
 AC_ARG_VAR(LOCAL_PATH_IS_ALSO_GLOBAL, [files on a local path on each node are also seen as global with same path @<:@default=true@:>@])
 
@@ -168,7 +163,6 @@
   CPPFLAGS+=" $MPI_INC"
   FCFLAGS+=" $MPI_INC"
   FLAGS_CHECK+=" $MPI_INC"
-  FLAGS_NO_CHECK+=" $MPI_INC"
 ])
 
 # Checks for libraries.
@@ -196,7 +190,6 @@
     CPPFLAGS+=" $ADIOS_INC"
     FCFLAGS+=" $ADIOS_INC"
     FLAGS_CHECK+=" $ADIOS_INC"
-    FLAGS_NO_CHECK+=" $ADIOS_INC"
   ])
   AS_IF([test x"$ADIOS_LIB" != x],[
     LDFLAGS+=" $ADIOS_LIB"
@@ -245,7 +238,6 @@
     [VEC_FLAG="-DFORCE_VECTORIZATION"]
   )
   FLAGS_CHECK+=" $VEC_FLAG"
-  FLAGS_NO_CHECK+=" $VEC_FLAG"
   # c compiler
   AS_CASE([$CC],
     # ibm compiler flag
@@ -274,7 +266,6 @@
     [VTK_FLAG="-DWITH_VTK"]
   )
   FLAGS_CHECK+=" $VTK_FLAG"
-  FLAGS_NO_CHECK+=" $VTK_FLAG"
   # c compiler
   AS_CASE([$CC],
     # ibm compiler flag

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk	2013-10-07 21:56:11 UTC (rev 22930)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk	2013-10-07 21:56:17 UTC (rev 22931)
@@ -171,8 +171,6 @@
 	$O/cuda_device_obj.o \
 	$(EMPTY_MACRO)
 
-LIBSPECFEM_SOLVER = $O/libspecfem_solver.a
-
 ifeq ($(CUDA),yes)
 XSPECFEM_OBJECTS = $(specfem3D_SHARED_OBJECTS) $(specfem3D_OBJECTS) $(cuda_OBJECTS)
 else

More information about the CIG-COMMITS mailing list