[cig-commits] r15477 - seismo/3D/ADJOINT_TOMO/measure_adj

[carltape at geodynamics.org]

Author: carltape
Date: 2009-07-24 07:03:04 -0700 (Fri, 24 Jul 2009)
New Revision: 15477

Added:
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_gfortran_caltech
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort_caltech
Removed:
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort
Modified:
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
Log:
Adding Makefiles for testing compilers.


Modified: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile	2009-07-24 13:33:05 UTC (rev 15476)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile	2009-07-24 14:03:04 UTC (rev 15477)
@@ -6,7 +6,6 @@
 #LIB = -lsacio -lsac -ltau -lm -L/opt/seismo/lib -lDRWFiles -lf90recipes
 
 # ORIGINAL VERSION
-# I think we need the -fftw3 library as well.
 LIB = -L/opt/seismo/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
 
 MOD = mt_constants mt_variables mt_sub2 mt_sub

Added: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_gfortran_caltech
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_gfortran_caltech	                        (rev 0)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_gfortran_caltech	2009-07-24 14:03:04 UTC (rev 15477)
@@ -0,0 +1,39 @@
+F90 = gfortran
+F90_FLAGS = -O2
+
+LIB = -L/opt/seismo-util/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
+
+MOD = mt_constants mt_variables mt_sub2 mt_sub
+
+SRC_DIR = .
+MOD_DIR = mod
+OBJ_DIR = obj
+BIN_DIR = .
+MAIN = mt_measure_adj
+MOD_FLAG = module
+
+MOD_OBJ = $(patsubst %,$(OBJ_DIR)/%.o,$(MOD))
+F90_OBJ = #$(patsubst %,$(OBJ_DIR)/%.o,$(SUB))
+OBJ = $(F90_OBJ) $(MOD_OBJ)
+
+all : mt_measure_adj rotate_adj_src
+
+$(MAIN) : % : $(SRC_DIR)/%.f90 $(F90_OBJ) $(MOD_OBJ)
+	$(F90) -o $(BIN_DIR)/$* $(F90_FLAGS) $(SRC_DIR)/$*.f90 -I$(MOD_DIR) -J$(MOD_DIR) $(OBJ) $(LIB)
+
+$(F90_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
+	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 
+
+$(MOD_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
+	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 -I$(MOD_DIR) -J$(MOD_DIR) 
+
+# Note call to libraries
+rotate_adj_src: rotate_adj_src.f90
+	$(F90) -o rotate_adj_src rotate_adj_src.f90 -L/opt/seismo-util/lib -lDRWFiles
+
+.PHONY : clean
+
+clean:
+	\rm -f *.o *.mod *~ $(OBJ_DIR)/*.o $(MOD_DIR)/*.mod  *.txt* STA.*  OUTPUT_FILES/*  *.sac rotate_adj_src mt_measure_adj
+
+

Deleted: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort	2009-07-24 13:33:05 UTC (rev 15476)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort	2009-07-24 14:03:04 UTC (rev 15477)
@@ -1,39 +0,0 @@
-F90 = ifort 
-
-F90_FLAGS = -O2 -132
-
-LIB = -L/opt/seismo-util/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
-
-MOD = mt_constants mt_variables mt_sub2 mt_sub
-
-SRC_DIR = .
-MOD_DIR = mod
-OBJ_DIR = obj
-BIN_DIR = .
-MAIN = mt_measure_adj
-MOD_FLAG = module
-
-MOD_OBJ = $(patsubst %,$(OBJ_DIR)/%.o,$(MOD))
-F90_OBJ = #$(patsubst %,$(OBJ_DIR)/%.o,$(SUB))
-OBJ = $(F90_OBJ) $(MOD_OBJ)
-
-all : mt_measure_adj rotate_adj_src
-
-$(MAIN) : % : $(SRC_DIR)/%.f90 $(F90_OBJ) $(MOD_OBJ)
-	$(F90) -o $(BIN_DIR)/$* $(F90_FLAGS) $(SRC_DIR)/$*.f90 -$(MOD_FLAG) $(MOD_DIR) $(OBJ) $(LIB)
-
-$(F90_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
-	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 
-
-$(MOD_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
-	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 -$(MOD_FLAG) $(MOD_DIR) 
-
-rotate_adj_src: rotate_adj_src.f90
-	$(F90) -o rotate_adj_src rotate_adj_src.f90 -L/opt/seismo-util/lib -lDRWFiles
-
-.PHONY : clean
-
-clean:
-	\rm -f *.o *.mod *~ $(OBJ_DIR)/*.o $(MOD_DIR)/*.mod  *.txt* STA.*  OUTPUT_FILES/*  *.sac rotate_adj_src mt_measure_adj
-
-

Added: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort_caltech
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort_caltech	                        (rev 0)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort_caltech	2009-07-24 14:03:04 UTC (rev 15477)
@@ -0,0 +1,39 @@
+F90 = ifort 
+
+F90_FLAGS = -O2 -132
+
+LIB = -L/opt/seismo-util/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
+
+MOD = mt_constants mt_variables mt_sub2 mt_sub
+
+SRC_DIR = .
+MOD_DIR = mod
+OBJ_DIR = obj
+BIN_DIR = .
+MAIN = mt_measure_adj
+MOD_FLAG = module
+
+MOD_OBJ = $(patsubst %,$(OBJ_DIR)/%.o,$(MOD))
+F90_OBJ = #$(patsubst %,$(OBJ_DIR)/%.o,$(SUB))
+OBJ = $(F90_OBJ) $(MOD_OBJ)
+
+all : mt_measure_adj rotate_adj_src
+
+$(MAIN) : % : $(SRC_DIR)/%.f90 $(F90_OBJ) $(MOD_OBJ)
+	$(F90) -o $(BIN_DIR)/$* $(F90_FLAGS) $(SRC_DIR)/$*.f90 -$(MOD_FLAG) $(MOD_DIR) $(OBJ) $(LIB)
+
+$(F90_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
+	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 
+
+$(MOD_OBJ): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.f90
+	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 -$(MOD_FLAG) $(MOD_DIR) 
+
+rotate_adj_src: rotate_adj_src.f90
+	$(F90) -o rotate_adj_src rotate_adj_src.f90 -L/opt/seismo-util/lib -lDRWFiles
+
+.PHONY : clean
+
+clean:
+	\rm -f *.o *.mod *~ $(OBJ_DIR)/*.o $(MOD_DIR)/*.mod  *.txt* STA.*  OUTPUT_FILES/*  *.sac rotate_adj_src mt_measure_adj
+
+