[cig-commits] r22468 - seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Jun 30 18:24:15 PDT 2013
Author: dkomati1
Date: 2013-06-30 18:24:15 -0700 (Sun, 30 Jun 2013)
New Revision: 22468
Added:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/rules.mk
Removed:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile.in
Log:
done merging new files in "create_header_file"
Added: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile 2013-07-01 01:24:15 UTC (rev 22468)
@@ -0,0 +1,56 @@
+#=====================================================================
+#
+# S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
+# --------------------------------------------------
+#
+# Main authors: Dimitri Komatitsch and Jeroen Tromp
+# Princeton University, USA
+# and University of Pau / CNRS / INRIA, France
+# (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+# April 2011
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#=====================================================================
+
+DIR = create_header_file
+
+# The rest of this file is generic
+#######################################
+
+####
+#### targets
+####
+
+default:
+ $(MAKE) -C ../.. $(DIR)
+
+all:
+ $(MAKE) -C ../.. all
+
+clean:
+ $(MAKE) -C ../.. CLEAN=$(DIR) clean
+
+cleanall:
+ $(MAKE) -C ../.. clean
+
+backup:
+ mkdir -p bak
+ cp *f90 *h Makefile bak
+
+bak: backup
+
+.PHONY: default all clean cleanall backup bak
+
Deleted: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile.in 2013-07-01 01:22:13 UTC (rev 22467)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/Makefile.in 2013-07-01 01:24:15 UTC (rev 22468)
@@ -1,156 +0,0 @@
-#=====================================================================
-#
-# S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
-# --------------------------------------------------
-#
-# Main authors: Dimitri Komatitsch and Jeroen Tromp
-# Princeton University, USA
-# and University of Pau / CNRS / INRIA, France
-# (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-# April 2011
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#=====================================================================
-
-# @configure_input@
-
-FC = @FC@
-FCFLAGS = #@FCFLAGS@
-MPIFC = @MPIFC@
-MPILIBS = @MPILIBS@
-FLAGS_CHECK = @FLAGS_CHECK@
-FLAGS_NO_CHECK = @FLAGS_NO_CHECK@
-FCFLAGS_f90 = @FCFLAGS_f90@ -I../../setup
-
-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@
-CPPFLAGS = -I../../setup @CPPFLAGS@
-
-#AR = ar
-#ARFLAGS = cru
-#RANLIB = ranlib
-AR = @AR@
-ARFLAGS = @ARFLAGS@
-RANLIB = @RANLIB@
-
-## compilation directories
-# E : executables directory
-E = ../../bin
-# O : objects directory
-O = ../../obj
-# SHARED : shared directoy
-SHARED = ../shared
-# S : source file directory
-S = .
-# root directory
-S_TOP = ../..
-## setup file directory
-SETUP = ../../setup
-## output file directory
-OUTPUT = ../../OUTPUT_FILES
-
-#######################################
-
-XCREATE_HEADER_OBJECTS = \
- $O/auto_ner.shared.o \
- $O/count_elements.shared.o \
- $O/count_number_of_sources.shared.o \
- $O/count_points.shared.o \
- $O/define_all_layers.shared.o \
- $O/euler_angles.shared.o \
- $O/force_ftz.cc.o \
- $O/get_model_parameters.shared.o \
- $O/get_timestep_and_layers.shared.o \
- $O/get_value_parameters.shared.o \
- $O/memory_eval.shared.o \
- $O/param_reader.cc.o \
- $O/read_compute_parameters.shared.o \
- $O/read_parameter_file.shared.o \
- $O/read_value_parameters.shared.o \
- $O/reduce.shared.o \
- $O/rthetaphi_xyz.shared.o \
- $O/save_header_file.shared.o \
- $(EMPTY_MACRO)
-
-
-#######################################
-
-####
-#### targets
-####
-
-# default targets
-DEFAULT = \
- xcreate_header_file \
- $(EMPTY_MACRO)
-
-default: $(DEFAULT)
-
-all: clean default
-
-backup:
- cp *f90 *h Makefile bak
-
-bak: backup
-
-#######################################
-
-####
-#### rules for executables
-####
-
-xcreate_header_file: $O/create_header_file.o $(XCREATE_HEADER_OBJECTS)
- ${FCCOMPILE_CHECK} -o ${E}/xcreate_header_file $O/create_header_file.o $(XCREATE_HEADER_OBJECTS)
-
-## uses MPI compiler to link executable instead (usedful for cross-compilation)
-#xcreate_header_file: $O/create_header_file.o $(XCREATE_HEADER_OBJECTS)
-# ${MPIFCCOMPILE_CHECK} -o ${E}/xcreate_header_file $O/create_header_file.o $(XCREATE_HEADER_OBJECTS)
-
-clean:
- rm -f $O/* *.o work.pc* *.mod \
- ${E}/xcreate_header_file \
- PI*
-
-#######################################
-
-####
-#### rule for each .o file below
-####
-
-##
-## shared
-##
-$O/%.shared.o: ${SHARED}/%.f90 ${SETUP}/constants.h
- ${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-
-$O/%.sharedmpi.o: ${SHARED}/%.f90 ${SETUP}/constants.h
- ${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-
-$O/%.cc.o: ${SHARED}/%.c ${SETUP}/config.h
- ${CC} -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
-
-##
-## rule for create_header_file
-##
-$O/%.o: $S/%.f90 ${SETUP}/constants.h
- ${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-
Added: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/rules.mk (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/rules.mk 2013-07-01 01:24:15 UTC (rev 22468)
@@ -0,0 +1,97 @@
+#=====================================================================
+#
+# S p e c f e m 3 D G l o b e V e r s i o n 5 . 1
+# --------------------------------------------------
+#
+# Main authors: Dimitri Komatitsch and Jeroen Tromp
+# Princeton University, USA
+# and University of Pau / CNRS / INRIA, France
+# (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+# April 2011
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#=====================================================================
+
+#######################################
+
+create_header_file_TARGETS = \
+ $E/xcreate_header_file \
+ ${OUTPUT}/values_from_mesher.h \
+ $(EMPTY_MACRO)
+
+create_header_file_OBJECTS = \
+ $O/create_header_file.o \
+ $(EMPTY_MACRO)
+
+# These files come from the shared directory
+create_header_file_SHARED_OBJECTS = \
+ $O/auto_ner.o \
+ $O/count_number_of_sources.o \
+ $O/euler_angles.o \
+ $O/force_ftz.o \
+ $O/get_model_parameters.o \
+ $O/get_value_parameters.o \
+ $O/memory_eval.o \
+ $O/param_reader.o \
+ $O/read_compute_parameters.o \
+ $O/read_parameter_file.o \
+ $O/read_value_parameters.o \
+ $O/reduce.o \
+ $O/rthetaphi_xyz.o \
+ $O/save_header_file.o \
+ $(EMPTY_MACRO)
+
+#######################################
+
+####
+#### Mesher header file
+####
+
+${OUTPUT}/values_from_mesher.h: $E/xcreate_header_file $B/DATA/Par_file
+ @-rm -f $@
+ $E/xcreate_header_file
+ @test -f $@
+
+#######################################
+
+####
+#### rules for executables
+####
+
+${E}/xcreate_header_file: $(create_header_file_OBJECTS) $(create_header_file_SHARED_OBJECTS)
+ ${FCCOMPILE_CHECK} -o ${E}/xcreate_header_file $(create_header_file_OBJECTS) $(create_header_file_SHARED_OBJECTS)
+
+## uses MPI compiler to link executable instead (usedful for cross-compilation)
+#${E}/xcreate_header_file: $(create_header_file_OBJECTS) $(create_header_file_SHARED_OBJECTS)
+# ${MPIFCCOMPILE_CHECK} -o ${E}/xcreate_header_file $(create_header_file_OBJECTS) $(create_header_file_SHARED_OBJECTS)
+
+#######################################
+
+## compilation directories
+S := ${S_TOP}/src/create_header_file
+$(create_header_file_OBJECTS): S := ${S_TOP}/src/create_header_file
+
+####
+#### rule for each .o file below
+####
+
+##
+## create_header_file objects
+##
+
+$O/create_header_file.o: $S/create_header_file.f90
+ ${FCCOMPILE_CHECK} -c -o $O/create_header_file.o ${FCFLAGS_f90} $S/create_header_file.f90
+
More information about the CIG-COMMITS
mailing list