[cig-commits] [commit] devel: Fix lists of auxiliaries objects. (32510e7)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue May 20 13:33:25 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/f5b7671ceb41cb4709134e6b463b57ed7f2f22ad...f1cc12442584702e82241113e4a533e995c802e5
>---------------------------------------------------------------
commit 32510e7513ded3308b37150fc16b318fef5fcd61
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Mon May 19 23:29:20 2014 -0400
Fix lists of auxiliaries objects.
Not adding files to the main variables means they don't get cleaned up.
>---------------------------------------------------------------
32510e7513ded3308b37150fc16b318fef5fcd61
src/auxiliaries/rules.mk | 79 ++++++++++++++++++++++++++++++++----------------
1 file changed, 53 insertions(+), 26 deletions(-)
diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 2bda093..43b6f2b 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -79,22 +79,23 @@ model_upd_auxiliaries_OBJECTS = \
$O/specfem3D_par.spec.o \
$O/pml_par.spec.o \
$O/model_update.aux.o \
+ $O/initialize_simulation.spec.o \
+ $O/read_mesh_databases.spec.o \
+ $O/save_external_bin_m_up.aux.o \
+ $(EMPTY_MACRO)
+
+model_upd_auxiliaries_SHARED_OBJECTS = \
$O/check_mesh_resolution.shared.o \
$O/create_name_database.shared.o \
$O/exit_mpi.shared.o \
$O/get_attenuation_model.shared.o \
$O/gll_library.shared.o \
- $O/initialize_simulation.spec.o \
$O/param_reader.cc.o \
- $O/read_mesh_databases.spec.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
- $O/save_external_bin_m_up.aux.o \
$O/write_VTK_data.shared.o \
$(EMPTY_MACRO)
-model_upd_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
-
# cuda stubs
model_upd_auxiliaries_OBJECTS += $O/specfem3D_gpu_cuda_method_stubs.cudacc.o
@@ -117,24 +118,33 @@ adios_model_upd_auxiliaries_SHARED_STUBS = \
# conditional adios linking
ifeq ($(ADIOS),yes)
-model_upd_auxiliaries_OBJECTS += $(adios_model_upd_auxiliaries_OBJECTS) $(adios_model_upd_auxiliaries_SHARED_OBJECTS)
+model_upd_auxiliaries_OBJECTS += $(adios_model_upd_auxiliaries_OBJECTS)
+model_upd_auxiliaries_SHARED_OBJECTS += $(adios_model_upd_auxiliaries_SHARED_OBJECTS)
else
-model_upd_auxiliaries_OBJECTS += $(adios_model_upd_auxiliaries_STUBS) $(adios_model_upd_auxiliaries_SHARED_STUBS)
+model_upd_auxiliaries_OBJECTS += $(adios_model_upd_auxiliaries_STUBS)
+model_upd_auxiliaries_SHARED_OBJECTS += $(adios_model_upd_auxiliaries_SHARED_STUBS)
endif
+auxiliaries_OBJECTS += $(model_upd_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(model_upd_auxiliaries_SHARED_OBJECTS)
+
##
## sum_kernels
##
sum_kernels_auxiliaries_OBJECTS = \
$O/sum_kernels.aux.o \
+ $(EMPTY_MACRO)
+
+sum_kernels_auxiliaries_SHARED_OBJECTS = \
$O/exit_mpi.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
$(EMPTY_MACRO)
-sum_kernels_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
+auxiliaries_OBJECTS += $(sum_kernels_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(sum_kernels_auxiliaries_SHARED_OBJECTS)
##
@@ -142,6 +152,9 @@ sum_kernels_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
##
smooth_vol_data_auxiliaries_OBJECTS = \
$O/smooth_vol_data.aux.o \
+ $(EMPTY_MACRO)
+
+smooth_vol_data_auxiliaries_SHARED_OBJECTS = \
$O/exit_mpi.shared.o \
$O/gll_library.shared.o \
$O/param_reader.cc.o \
@@ -149,7 +162,8 @@ smooth_vol_data_auxiliaries_OBJECTS = \
$O/read_value_parameters.shared.o \
$(EMPTY_MACRO)
-smooth_vol_data_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
+auxiliaries_OBJECTS += $(smooth_vol_data_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(smooth_vol_data_auxiliaries_SHARED_OBJECTS)
##
@@ -157,10 +171,15 @@ smooth_vol_data_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
##
combine_surf_data_auxiliaries_OBJECTS = \
$O/combine_surf_data.aux.o \
+ $(EMPTY_MACRO)
+
+combine_surf_data_auxiliaries_SHARED_OBJECTS = \
$O/param_reader.cc.o \
$O/write_c_binary.cc.o \
$(EMPTY_MACRO)
+auxiliaries_OBJECTS += $(combine_surf_data_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(combine_surf_data_auxiliaries_SHARED_OBJECTS)
##
## combine_vol_data
@@ -168,14 +187,15 @@ combine_surf_data_auxiliaries_OBJECTS = \
combine_vol_data_auxiliaries_OBJECTS = \
$O/combine_vol_data.aux.o \
$O/combine_vol_data_impl.aux.o \
+ $(EMPTY_MACRO)
+
+combine_vol_data_auxiliaries_SHARED_OBJECTS = \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
$O/param_reader.cc.o \
$O/write_c_binary.cc.o \
$(EMPTY_MACRO)
-combine_vol_data_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
-
## ADIOS
# conditional adios linking
ifeq ($(ADIOS),yes)
@@ -184,9 +204,13 @@ combine_vol_data_auxiliaries_OBJECTS += \
else
combine_vol_data_auxiliaries_OBJECTS += \
$O/bypass_implicit_interface.aux_noadios.o \
- $O/adios_manager_stubs.shared_noadios.o \
$O/combine_vol_data_adios_stubs.aux_noadios.o
+combine_vol_data_auxiliaries_SHARED_OBJECTS += \
+ $O/adios_manager_stubs.shared_noadios.o
endif
+
+auxiliaries_OBJECTS += $(combine_vol_data_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(combine_vol_data_auxiliaries_SHARED_OBJECTS)
auxiliaries_MODULES += combine_vol_data_adios_mod.mod
##
@@ -194,6 +218,9 @@ auxiliaries_MODULES += combine_vol_data_adios_mod.mod
##
create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS = \
$O/create_movie_shakemap_AVS_DX_GMT.aux.o \
+ $(EMPTY_MACRO)
+
+create_movie_shakemap_AVS_DX_GMT_auxiliaries_SHARED_OBJECTS = \
$O/get_global.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
@@ -202,6 +229,8 @@ create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS = \
$O/utm_geo.shared.o \
$(EMPTY_MACRO)
+auxiliaries_OBJECTS += $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS)
+auxiliaries_SHARED_OBJECTS += $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_SHARED_OBJECTS)
#######################################
@@ -237,23 +266,23 @@ xsum_kernels: $E/xsum_kernels
$E/xconvolve_source_timefunction: $O/convolve_source_timefunction.aux.o
${FCCOMPILE_CHECK} -o ${E}/xconvolve_source_timefunction $O/convolve_source_timefunction.aux.o
-$E/xcombine_surf_data: $(combine_surf_data_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xcombine_surf_data $(combine_surf_data_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xcombine_surf_data: $(combine_surf_data_auxiliaries_OBJECTS) $(combine_surf_data_auxiliaries_SHARED_OBJECTS)
+ ${FCLINK} -o $@ $+
-$E/xcombine_vol_data: $(combine_vol_data_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xcombine_vol_data $(combine_vol_data_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xcombine_vol_data: $(combine_vol_data_auxiliaries_OBJECTS) $(combine_vol_data_auxiliaries_SHARED_OBJECTS) $(COND_MPI_OBJECTS)
+ ${FCLINK} -o $@ $+ $(MPILIBS)
-$E/xcreate_movie_shakemap_AVS_DX_GMT: $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xcreate_movie_shakemap_AVS_DX_GMT $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xcreate_movie_shakemap_AVS_DX_GMT: $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS) $(create_movie_shakemap_AVS_DX_GMT_auxiliaries_SHARED_OBJECTS)
+ ${FCLINK} -o $@ $+
-$E/xmodel_update: $(model_upd_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xmodel_update $(model_upd_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xmodel_update: $(model_upd_auxiliaries_OBJECTS) $(model_upd_auxiliaries_SHARED_OBJECTS) $(COND_MPI_OBJECTS)
+ ${FCLINK} -o $@ $+ $(MPILIBS)
-$E/xsmooth_vol_data: $(smooth_vol_data_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xsmooth_vol_data $(smooth_vol_data_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xsmooth_vol_data: $(smooth_vol_data_auxiliaries_OBJECTS) $(smooth_vol_data_auxiliaries_SHARED_OBJECTS) $(COND_MPI_OBJECTS)
+ ${FCLINK} -o $@ $+ $(MPILIBS)
-$E/xsum_kernels: $(sum_kernels_auxiliaries_OBJECTS)
- ${FCLINK} -o ${E}/xsum_kernels $(sum_kernels_auxiliaries_OBJECTS) $(MPILIBS)
+$E/xsum_kernels: $(sum_kernels_auxiliaries_OBJECTS) $(sum_kernels_auxiliaries_SHARED_OBJECTS) $(COND_MPI_OBJECTS)
+ ${FCLINK} -o $@ $+ $(MPILIBS)
#######################################
@@ -273,8 +302,6 @@ $O/combine_vol_data.aux.o: $O/combine_vol_data_impl.aux.o $O/combine_vol_data_ad
endif
-
-
#######################################
####
More information about the CIG-COMMITS
mailing list