[cig-commits] [commit] devel: build: Remove unnecessary cleanup. (c6c3649)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 1 00:50:30 PDT 2014
Repository : ssh://geoshell/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75
>---------------------------------------------------------------
commit c6c3649bdbfd3f8074a92b51dc1a1fb6cffa8fd5
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Fri Apr 25 01:39:09 2014 -0400
build: Remove unnecessary cleanup.
Everything in obj/ should be in one of the variables defined in the
subdirectories. Especially when doing make clean in a subdirectory, the
entire point is to not delete all objects. The new modules were not
correctly listed in the rules, which is probably why this was added.
>---------------------------------------------------------------
c6c3649bdbfd3f8074a92b51dc1a1fb6cffa8fd5
Makefile.in | 6 +++---
src/auxiliaries/rules.mk | 10 +++++-----
src/decompose_mesh/rules.mk | 11 ++++++++---
src/generate_databases/rules.mk | 21 ++++++++++++++++-----
src/meshfem3D/rules.mk | 15 ++++++++++-----
src/shared/rules.mk | 20 ++++++++++++++++----
src/specfem3D/rules.mk | 21 +++++++++++++++------
7 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 2661735..65f7944 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -253,11 +253,11 @@ backup:
ifdef CLEAN
clean:
@echo "cleaning by CLEAN defined"
- -rm -f $(foreach dir, $(CLEAN), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_SHARED_OBJECTS) $($(dir)_TARGETS)) $O/*
+ -rm -f $(foreach dir, $(CLEAN), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_SHARED_OBJECTS) $($(dir)_TARGETS))
else
clean:
@echo "cleaning by CLEAN not defined"
- -rm -f $(foreach dir, $(SUBDIRS), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_TARGETS)) $O/*
+ -rm -f $(foreach dir, $(SUBDIRS), $($(dir)_OBJECTS) $($(dir)_MODULES) $($(dir)_TARGETS))
endif
realclean: clean
@@ -265,7 +265,7 @@ ifeq (${SCOTCH_BUNDLED},1)
@echo "cleaning bundled Scotch in directory: ${SCOTCH_DIR}/src"
$(MAKE) -C ${SCOTCH_DIR}/src realclean
endif
- rm -rf $E/* $O/* $L/*
+ -rm -f $E/* $O/*
help:
@echo "usage: make [executable]"
diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 647da76..27dea30 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -106,9 +106,9 @@ adios_model_upd_auxiliaries_OBJECTS= \
$O/read_forward_arrays_adios.spec_adios.o
adios_model_upd_auxiliaries_SHARED_OBJECTS = \
- $O/adios_manager.shared_adios.o \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o
adios_model_upd_auxiliaries_STUBS = \
@@ -272,8 +272,8 @@ $O/combine_vol_data_adios_stubs.aux_noadios.o: $O/adios_manager_stubs.shared_noa
ifeq ($(ADIOS),yes)
$O/combine_vol_data.aux.o: $O/combine_vol_data_impl.aux.o $O/combine_vol_data_adios_impl.aux_adios.o
$O/adios_helpers.shared_adios.o: \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o
else
$O/combine_vol_data.aux.o: $O/combine_vol_data_impl.aux.o $O/combine_vol_data_adios_stubs.aux_noadios.o $O/bypass_implicit_interface.aux_noadios.o
endif
diff --git a/src/decompose_mesh/rules.mk b/src/decompose_mesh/rules.mk
index 344f7ed..18d1137 100644
--- a/src/decompose_mesh/rules.mk
+++ b/src/decompose_mesh/rules.mk
@@ -37,8 +37,8 @@ $(decompose_mesh_OBJECTS): S = ${S_TOP}/src/decompose_mesh
# default targets for the Pyrized version
decompose_mesh_TARGETS = \
- $E/xscotch \
- $E/xdecompose_mesh \
+ $E/xscotch \
+ $E/xdecompose_mesh \
$(EMPTY_MACRO)
decompose_mesh_OBJECTS = \
@@ -48,6 +48,12 @@ decompose_mesh_OBJECTS = \
$O/program_decompose_mesh.dec.o \
$(EMPTY_MACRO)
+decompose_mesh_MODULES = \
+ $(FC_MODDIR)/decompose_mesh.$(FC_MODEXT) \
+ $(FC_MODDIR)/fault_scotch.$(FC_MODEXT) \
+ $(FC_MODDIR)/part_decompose_mesh.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
decompose_mesh_SHARED_OBJECTS = \
$O/get_value_parameters.shared.o \
$O/param_reader.cc.o \
@@ -57,7 +63,6 @@ decompose_mesh_SHARED_OBJECTS = \
$(EMPTY_MACRO)
-
#######################################
####
diff --git a/src/generate_databases/rules.mk b/src/generate_databases/rules.mk
index f682136..64c5636 100644
--- a/src/generate_databases/rules.mk
+++ b/src/generate_databases/rules.mk
@@ -75,6 +75,17 @@ generate_databases_OBJECTS = \
$(EMPTY_MACRO)
+generate_databases_MODULES = \
+ $(FC_MODDIR)/create_regions_mesh_ext_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/external_model.$(FC_MODEXT) \
+ $(FC_MODDIR)/fault_generate_databases.$(FC_MODEXT) \
+ $(FC_MODDIR)/generate_databases_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_ipati_adios_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/salton_trough_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/tomography_par.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
+
generate_databases_SHARED_OBJECTS = \
$O/assemble_MPI_scalar.shared.o \
$O/check_mesh_resolution.shared.o \
@@ -112,9 +123,9 @@ generate_databases_SHARED_OBJECTS = \
# using ADIOS files
adios_generate_databases_PREOBJECTS= \
- $O/adios_manager.shared_adios.o \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o
adios_generate_databases_OBJECTS= \
@@ -213,8 +224,8 @@ endif
$O/generate_databases_adios_stubs.gen_noadios.o: $(adios_generate_databases_PRESTUBS)
$O/adios_helpers.shared_adios.o: \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o
diff --git a/src/meshfem3D/rules.mk b/src/meshfem3D/rules.mk
index c899b38..59942c8 100644
--- a/src/meshfem3D/rules.mk
+++ b/src/meshfem3D/rules.mk
@@ -62,6 +62,11 @@ meshfem3D_OBJECTS = \
$O/store_coords.mesh.o \
$(EMPTY_MACRO)
+meshfem3D_MODULES = \
+ $(FC_MODDIR)/createregmesh.$(FC_MODEXT) \
+ $(FC_MODDIR)/readparfile.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
meshfem3D_SHARED_OBJECTS = \
$O/exit_mpi.shared.o \
$O/get_global.shared.o \
@@ -78,9 +83,9 @@ meshfem3D_SHARED_OBJECTS = \
# using ADIOS files
adios_meshfem3D_PREOBJECTS= \
- $O/adios_manager.shared_adios.o \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o
adios_meshfem3D_OBJECTS= \
@@ -140,8 +145,8 @@ $O/save_databases_adios.mesh_adios.o: $O/safe_alloc_mod.shared.o $(adios_meshfem
$O/create_regions_mesh.mesh.o: $(adios_meshfem3D_PREOBJECTS)
$O/adios_helpers.shared_adios.o: \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o
####
diff --git a/src/shared/rules.mk b/src/shared/rules.mk
index 9decffa..6f3cd80 100644
--- a/src/shared/rules.mk
+++ b/src/shared/rules.mk
@@ -64,7 +64,7 @@ shared_OBJECTS = \
$O/read_topo_bathy_file.shared.o \
$O/read_value_parameters.shared.o \
$O/recompute_jacobian.shared.o \
- $O/save_alloc_mod.shared.o \
+ $O/safe_alloc_mod.shared.o \
$O/save_header_file.shared.o \
$O/sort_array_coordinates.shared.o \
$O/utm_geo.shared.o \
@@ -72,6 +72,12 @@ shared_OBJECTS = \
$O/write_VTK_data.shared.o \
$(EMPTY_MACRO)
+
+shared_MODULES = \
+ $(FC_MODDIR)/safe_alloc_mod.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
+
###
### MPI
###
@@ -93,17 +99,23 @@ adios_shared_MODULES = \
$(FC_MODDIR)/adios_helpers_definitions_mod.$(FC_MODEXT) \
$(FC_MODDIR)/adios_helpers_mod.$(FC_MODEXT) \
$(FC_MODDIR)/adios_helpers_writers_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/adios_manager_mod.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
+adios_shared_STUB_OBJECTS = \
+ $O/adios_manager_stubs.shared_noadios.o \
$(EMPTY_MACRO)
-adios_shared_STUBS = \
- $O/adios_manager_stubs.cc.o \
+adios_shared_STUB_MODULES = \
+ $(FC_MODDIR)/adios_manager_mod.$(FC_MODEXT) \
$(EMPTY_MACRO)
ifeq ($(ADIOS),yes)
shared_OBJECTS += $(adios_shared_OBJECTS)
shared_MODULES += $(adios_shared_MODULES)
else
-shared_OBJECTS += $(adios_shared_STUBS)
+shared_OBJECTS += $(adios_shared_STUB_OBJECTS)
+shared_MODULES += $(adios_shared_STUB_MODULES)
endif
#######################################
diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 3090e44..970842b 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -145,12 +145,21 @@ specfem3D_SHARED_OBJECTS = \
specfem3D_MODULES = \
$(FC_MODDIR)/constants.$(FC_MODEXT) \
+ $(FC_MODDIR)/fault_solver_common.$(FC_MODEXT) \
+ $(FC_MODDIR)/fault_solver_dynamic.$(FC_MODEXT) \
+ $(FC_MODDIR)/fault_solver_kinematic.$(FC_MODEXT) \
+ $(FC_MODDIR)/gravity_perturbation.$(FC_MODEXT) \
+ $(FC_MODDIR)/image_pnm_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/pml_par.$(FC_MODEXT) \
$(FC_MODDIR)/specfem_par.$(FC_MODEXT) \
- $(FC_MODDIR)/specfem_par_elastic.$(FC_MODEXT) \
$(FC_MODDIR)/specfem_par_acoustic.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_elastic.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_poroelastic.$(FC_MODEXT) \
$(FC_MODDIR)/specfem_par_movie.$(FC_MODEXT) \
+ $(FC_MODDIR)/user_noise_distribution.$(FC_MODEXT) \
$(EMPTY_MACRO)
+
###
### MPI
###
@@ -213,9 +222,9 @@ adios_specfem3D_OBJECTS= \
$O/save_kernels_adios.spec_adios.o
adios_specfem3D_PREOBJECTS = \
- $O/adios_manager.shared_adios.o \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o
adios_specfem3D_STUBS = \
@@ -356,8 +365,8 @@ $O/save_forward_arrays_adios.spec_adios.o: $O/specfem3D_par.spec.o $O/pml_par.sp
$O/finalize_simulation.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o $O/gravity_perturbation.spec.o $(adios_specfem3D_PREOBJECTS)
$O/specfem3D_adios_stubs.spec_noadios.o: $O/adios_manager_stubs.shared_noadios.o
$O/adios_helpers.shared_adios.o: \
- $O/adios_helpers_definitions.shared_adios.o \
- $O/adios_helpers_writers.shared_adios.o
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o
####
More information about the CIG-COMMITS
mailing list