[cig-commits] r22948 - in seismo/3D/SPECFEM3D_GLOBE/trunk: . src/meshfem3D src/shared src/specfem3D
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Tue Oct 8 00:13:28 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-10-08 00:13:28 -0700 (Tue, 08 Oct 2013)
New Revision: 22948
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
Log:
build: Fix `make clean' command.
* Update list of modules.
* Append optional build targets to main list of objects.
* Remove required targets. The bin and obj directories should always
exist if Make is functioning correctly.
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in 2013-10-08 07:13:22 UTC (rev 22947)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/Makefile.in 2013-10-08 07:13:28 UTC (rev 22948)
@@ -195,14 +195,6 @@
default: $(DEFAULT)
-required: bin obj
-
-bin:
- mkdir -p $E
-
-obj:
- mkdir -p $O
-
backup:
cp -rp src setup DATA/Par_file* Makefile go_mesher* go_solver* mymachines bak
@@ -250,15 +242,15 @@
# Shortcut for: <prog>/<xprog> -> bin/<xprog>
define target_shortcut
-$(patsubst $E/%, %, $(1)): required $(1)
+$(patsubst $E/%, %, $(1)): $(1)
.PHONY: $(patsubst $E/%, %, $(1))
-$(patsubst $E/x%, %, $(1)): required $(1)
+$(patsubst $E/x%, %, $(1)): $(1)
.PHONY: $(patsubst $E/x%, %, $(1))
endef
# Shortcut for: dir -> src/dir/<targets in here>
define shortcut
-$(1): required $($(1)_TARGETS)
+$(1): $($(1)_TARGETS)
.PHONY: $(1)
$$(foreach target, $$(filter $E/%,$$($(1)_TARGETS)), $$(eval $$(call target_shortcut,$$(target))))
endef
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:13:22 UTC (rev 22947)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
@@ -118,9 +118,36 @@
$(EMPTY_MACRO)
meshfem3D_MODULES = \
+ $(FC_MODDIR)/create_regions_mesh_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/create_regions_mesh_par2.$(FC_MODEXT) \
+ $(FC_MODDIR)/create_mpi_interfaces_par.$(FC_MODEXT) \
$(FC_MODDIR)/gapp2_mantle_model_constants.$(FC_MODEXT) \
$(FC_MODDIR)/meshfem3d_models_par.$(FC_MODEXT) \
- $(FC_MODDIR)/module_ppm.$(FC_MODEXT) \
+ $(FC_MODDIR)/meshfem3d_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/mpi_crust_mantle_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/mpi_inner_core_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/mpi_outer_core_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_1066a_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_1dref_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_ak135_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_aniso_mantle_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_atten3d_qrfsi12_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_crust_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_crustmaps_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_epcrust_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_eucrust_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_heterogen_mantle_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_jp3d_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_ppm_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_s20rts_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_s362ani_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_s40rts_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_sea1d_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/model_sea99_s_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/avs_dx_global_chunks_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/avs_dx_global_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/avs_dx_global_faces_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/avs_dx_surface_mod.$(FC_MODEXT) \
$(EMPTY_MACRO)
# These files come from the shared directory
@@ -161,17 +188,11 @@
$O/write_VTK_file.shared.o \
$(EMPTY_MACRO)
-XMESHFEM_OBJECTS = $(meshfem3D_SHARED_OBJECTS) $(meshfem3D_OBJECTS)
-
###
### ADIOS
###
adios_meshfem3D_OBJECTS = \
- $O/adios_helpers_definitions.shared_adios_module.o \
- $O/adios_helpers_writers.shared_adios_module.o \
- $O/adios_helpers.shared_adios.o \
- $O/adios_manager.shared_adios.o \
$O/write_AVS_DX_global_chunks_data_adios.check_adios_module.o \
$O/write_AVS_DX_global_data_adios.check_adios_module.o \
$O/write_AVS_DX_global_faces_data_adios.check_adios_module.o \
@@ -182,15 +203,27 @@
$O/save_arrays_solver_adios.check_adios.o \
$(EMPTY_MACRO)
+adios_meshfem3D_SHARED_OBJECTS = \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
+ $O/adios_helpers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $(EMPTY_MACRO)
+
adios_STUBS = \
+ $(EMPTY_MACRO)
+
+adios_SHARED_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
# conditional adios linking
ifeq ($(ADIOS),yes)
-XMESHFEM_OBJECTS += $(adios_meshfem3D_OBJECTS)
+meshfem3D_OBJECTS += $(adios_meshfem3D_OBJECTS)
+meshfem3D_SHARED_OBJECTS += $(adios_meshfem3D_SHARED_OBJECTS)
else
-XMESHFEM_OBJECTS += $(adios_STUBS)
+meshfem3D_OBJECTS += $(adios_STUBS)
+meshfem3D_SHARED_OBJECTS += $(adios_SHARED_STUBS)
endif
#######################################
@@ -199,9 +232,9 @@
#### rules for executables
####
-${E}/xmeshfem3D: $(XMESHFEM_OBJECTS)
+${E}/xmeshfem3D: $(meshfem3D_SHARED_OBJECTS) $(meshfem3D_OBJECTS)
## use MPI here
- ${MPIFCCOMPILE_CHECK} -o ${E}/xmeshfem3D $(XMESHFEM_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
+ ${MPIFCCOMPILE_CHECK} -o ${E}/xmeshfem3D $(meshfem3D_SHARED_OBJECTS) $(meshfem3D_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
#######################################
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:13:22 UTC (rev 22947)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
@@ -84,10 +84,22 @@
$O/adios_manager.shared_adios.o \
$(EMPTY_MACRO)
+ADIOS_MODULES = \
+ $(FC_MODDIR)/adios_helpers_definitions_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/adios_helpers_mod.$(FC_MODEXT) \
+ $(FC_MODDIR)/adios_helpers_writers_mod.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
ADIOS_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
+ifeq ($(ADIOS),yes)
+shared_OBJECTS += $(ADIOS_OBJECTS)
+shared_MODULES += $(ADIOS_MODULES)
+else
+shared_OBJECTS += $(ADIOS_STUBS)
+endif
#######################################
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:13:22 UTC (rev 22947)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
@@ -101,6 +101,15 @@
$O/write_seismograms.solverstatic.o \
$(EMPTY_MACRO)
+specfem3D_MODULES = \
+ $(FC_MODDIR)/constants_solver.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_crustmantle.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_innercore.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_outercore.$(FC_MODEXT) \
+ $(FC_MODDIR)/specfem_par_movie.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
# These files come from the shared directory
specfem3D_SHARED_OBJECTS = \
$O/shared_par.shared_module.o \
@@ -172,9 +181,12 @@
$(EMPTY_MACRO)
ifeq ($(CUDA),yes)
-XSPECFEM_OBJECTS = $(specfem3D_SHARED_OBJECTS) $(specfem3D_OBJECTS) $(cuda_OBJECTS)
+specfem3D_OBJECTS += $(cuda_OBJECTS)
+ifeq ($(CUDA5),yes)
+specfem3D_OBJECTS += $(cuda_DEVICE_OBJ)
+endif
else
-XSPECFEM_OBJECTS = $(specfem3D_SHARED_OBJECTS) $(specfem3D_OBJECTS) $(cuda_STUBS)
+specfem3D_OBJECTS += $(cuda_STUBS)
endif
###
@@ -182,10 +194,6 @@
###
adios_OBJECTS = \
- $O/adios_helpers_definitions.shared_adios_module.o \
- $O/adios_helpers_writers.shared_adios_module.o \
- $O/adios_helpers.shared_adios.o \
- $O/adios_manager.shared_adios.o \
$O/read_arrays_solver_adios.solverstatic_adios.o \
$O/read_attenuation_adios.solverstatic_adios.o \
$O/read_forward_arrays_adios.solverstatic_adios.o \
@@ -195,15 +203,27 @@
$O/write_specfem_adios_header.solverstatic_adios.o \
$(EMPTY_MACRO)
+adios_SHARED_OBJECTS = \
+ $O/adios_helpers_definitions.shared_adios_module.o \
+ $O/adios_helpers_writers.shared_adios_module.o \
+ $O/adios_helpers.shared_adios.o \
+ $O/adios_manager.shared_adios.o \
+ $(EMPTY_MACRO)
+
adios_STUBS = \
+ $(EMPTY_MACRO)
+
+adios_SHARED_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
# conditional adios linking
ifeq ($(ADIOS),yes)
-XSPECFEM_OBJECTS += $(adios_OBJECTS)
+specfem3D_OBJECTS += $(adios_OBJECTS)
+specfem3D_SHARED_OBJECTS += $(adios_SHARED_OBJECTS)
else
-XSPECFEM_OBJECTS += $(adios_STUBS)
+specfem3D_OBJECTS += $(adios_STUBS)
+specfem3D_SHARED_OBJECTS += $(adios_SHARED_STUBS)
endif
###
@@ -220,9 +240,9 @@
# conditional adios linking
ifeq ($(VTK),yes)
-XSPECFEM_OBJECTS += $(vtk_OBJECTS)
+specfem3D_OBJECTS += $(vtk_OBJECTS)
else
-XSPECFEM_OBJECTS += $(vtk_STUBS)
+specfem3D_OBJECTS += $(vtk_STUBS)
endif
@@ -238,22 +258,22 @@
ifeq ($(CUDA5),yes)
## cuda 5 version
-${E}/xspecfem3D: $(XSPECFEM_OBJECTS)
+${E}/xspecfem3D: $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS)
@echo ""
@echo "building xspecfem3D with CUDA 5 support"
@echo ""
${NVCCLINK} -o $(cuda_DEVICE_OBJ) $(cuda_OBJECTS)
- ${FCLINK} -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(cuda_DEVICE_OBJ) $(LDFLAGS) $(MPILIBS) $(CUDA_LINK) $(LIBS)
+ ${FCLINK} -o ${E}/xspecfem3D $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS) $(LDFLAGS) $(MPILIBS) $(CUDA_LINK) $(LIBS)
@echo ""
else
## cuda 4 version
-${E}/xspecfem3D: $(XSPECFEM_OBJECTS)
+${E}/xspecfem3D: $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS)
@echo ""
@echo "building xspecfem3D with CUDA 4 support"
@echo ""
- ${FCLINK} -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(LDFLAGS) $(MPILIBS) $(CUDA_LINK) $(LIBS)
+ ${FCLINK} -o ${E}/xspecfem3D $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS) $(LDFLAGS) $(MPILIBS) $(CUDA_LINK) $(LIBS)
@echo ""
endif
@@ -261,14 +281,14 @@
else
## non-cuda version
-${E}/xspecfem3D: $(XSPECFEM_OBJECTS)
+${E}/xspecfem3D: $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS)
@echo ""
@echo "building xspecfem3D without CUDA support"
@echo ""
## use MPI here
## DK DK add OpenMP compiler flag here if needed
-# ${MPIFCCOMPILE_CHECK} -qsmp=omp -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
- ${MPIFCCOMPILE_CHECK} -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
+# ${MPIFCCOMPILE_CHECK} -qsmp=omp -o ${E}/xspecfem3D $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
+ ${MPIFCCOMPILE_CHECK} -o ${E}/xspecfem3D $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS) $(LDFLAGS) $(MPILIBS) $(LIBS)
@echo ""
endif
More information about the CIG-COMMITS
mailing list