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

[carltape at geodynamics.org]

Author: carltape
Date: 2009-05-15 16:59:08 -0700 (Fri, 15 May 2009)
New Revision: 15000

Added:
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort
Modified:
   seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
Log:
Modified Makefile to run gfortran as the default, rather than ifort.


Modified: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile	2009-05-15 22:32:48 UTC (rev 14999)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile	2009-05-15 23:59:08 UTC (rev 15000)
@@ -1,8 +1,8 @@
-F90 = ifort 
+F90 = gfortran
 
-F90_FLAGS = -O2 -132
+F90_FLAGS = -O2 -ffixed-line-length-132
 
-LIB = -L/opt/seismo-util/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
+LIB = -L/opt/seismo/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
 
 MOD = mt_constants mt_variables mt_sub2 mt_sub
 
@@ -20,16 +20,16 @@
 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) -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 -$(MOD_FLAG) $(MOD_DIR) 
+	$(F90) -o $@ $(F90_FLAGS) -c $(SRC_DIR)/$*.f90 -I$(MOD_DIR) -J$(MOD_DIR) 
 
 rotate_adj_src: rotate_adj_src.f90
-	$(F90) -o rotate_adj_src rotate_adj_src.f90 -L/opt/seismo-util/lib -lDRWFiles
+	$(F90) -o rotate_adj_src rotate_adj_src.f90 -L/opt/seismo/lib -lDRWFiles
 
 .PHONY : clean
 

Added: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort	                        (rev 0)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile_ifort	2009-05-15 23:59:08 UTC (rev 15000)
@@ -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
+
+