[cig-commits] [commit] devel: build: Fix module dependencies in solver. (eb3759e)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Sat Apr 19 05:31:19 PDT 2014


Repository : ssh://geoshell/specfem3d_globe

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/c58836eea530691b891eb26a61bddd1a87ec348c...46b00e6b38b82d267194090fb713f38485f162cc

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

commit eb3759e313e236ef9223352b00f93795d8cb6ef9
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Fri Apr 18 22:59:50 2014 -0400

    build: Fix module dependencies in solver.
    
     * write_seismograms depends on specfem_par.
     * Some new ASDF dependencies.
     * Several files depend on module created from write_seismograms.


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

eb3759e313e236ef9223352b00f93795d8cb6ef9
 src/specfem3D/rules.mk | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 97cca05..c41fcb6 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -52,7 +52,7 @@ specfem3D_OBJECTS = \
 specfem3D_OBJECTS += \
 	$O/asdf_data.solverstatic_module.o \
 	$O/specfem3D_par.solverstatic_module.o \
-	$O/write_seismograms.solverstatic_module.o \
+	$O/write_seismograms.solverstatic.o \
 	$O/check_stability.solverstatic.o \
 	$O/compute_add_sources.solverstatic.o \
 	$O/compute_arrays_source.solverstatic.o \
@@ -312,6 +312,20 @@ $(specfem3D_OBJECTS): S = ${S_TOP}/src/specfem3D
 ####
 
 ###
+### additional dependencies
+###
+
+$O/write_output_ASDF.solverstatic_adios.o: $O/asdf_helpers.shared_adios.o $O/asdf_helpers_writers.shared_adios.o $O/asdf_data.solverstatic_module.o
+
+$O/write_seismograms.solverstatic.o: $O/asdf_data.solverstatic_module.o
+
+$O/compute_arrays_source.solverstatic.o: $O/write_seismograms.solverstatic.o
+$O/iterate_time.solverstatic.o: $O/write_seismograms.solverstatic.o
+$O/iterate_time_undoatt.solverstatic.o: $O/write_seismograms.solverstatic.o
+$O/locate_receivers.solverstatic.o: $O/write_seismograms.solverstatic.o
+$O/read_adjoint_sources.solverstatic.o: $O/write_seismograms.solverstatic.o
+
+###
 ### specfem3D - optimized flags and dependence on values from mesher here
 ###
 $O/%.solverstatic_module.o: $S/%.F90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
@@ -331,7 +345,7 @@ $O/%.solverstatic_openmp.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_pa
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -qsmp=omp -o $@ $<
 
 
-$O/%.solverstatic_adios.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o $O/asdf_helpers.shared_adios.o
+$O/%.solverstatic_adios.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o
 	${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 $O/%.solverstatic_adios.o: $S/%.F90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o



More information about the CIG-COMMITS mailing list