[cig-commits] r22911 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: auxiliaries compute_optimized_dumping_undo_att create_header_file meshfem3D shared specfem3D
danielpeter at geodynamics.org
danielpeter at geodynamics.org
Tue Oct 1 11:27:29 PDT 2013
Author: danielpeter
Date: 2013-10-01 11:27:28 -0700 (Tue, 01 Oct 2013)
New Revision: 22911
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk
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:
updates compilation rules for running parallel make
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -52,7 +52,7 @@
# These files come from the shared directory
auxiliaries_SHARED_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/calendar.shared.o \
$O/count_elements.shared.o \
@@ -106,7 +106,7 @@
${E}/xcreate_movie_GMT_global: $(auxiliaries_SHARED_OBJECTS) $O/create_movie_GMT_global.aux.o
${FCCOMPILE_CHECK} -o ${E}/xcreate_movie_GMT_global $(auxiliaries_SHARED_OBJECTS) $O/create_movie_GMT_global.aux.o
-${E}/xextract_database: $(S_TOP)/utils/extract_database/extract_database.f90
+${E}/xextract_database: $(S_TOP)/utils/extract_database/extract_database.f90 ${OUTPUT}/values_from_mesher.h
${FCCOMPILE_CHECK} -o ${E}/xextract_database ${FCFLAGS_f90} $(S_TOP)/utils/extract_database/extract_database.f90
#######################################
@@ -122,10 +122,10 @@
##
## auxiliaries
##
-$O/%.aux.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.aux.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.auxsolver.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h
+$O/%.auxsolver.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -37,7 +37,7 @@
# These files come from the shared directory
compute_optimized_dumping_undo_att_SHARED_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/count_elements.shared.o \
$O/count_number_of_sources.shared.o \
@@ -81,6 +81,6 @@
#### rule for each .o file below
####
-$O/%.optdump.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.optdump.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -38,7 +38,7 @@
# These files come from the shared directory
create_header_file_SHARED_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/count_elements.shared.o \
$O/count_number_of_sources.shared.o \
@@ -83,7 +83,7 @@
${E}/xcreate_header_file: $(create_header_file_SHARED_OBJECTS) $(create_header_file_OBJECTS)
${FCCOMPILE_CHECK} -o ${E}/xcreate_header_file $(create_header_file_SHARED_OBJECTS) $(create_header_file_OBJECTS)
-## uses MPI compiler to link executable instead (usedful for cross-compilation)
+## uses MPI compiler to link executable instead (useful for cross-compilation)
#${E}/xcreate_header_file: $(create_header_file_SHARED_OBJECTS) $(create_header_file_OBJECTS)
# ${MPIFCCOMPILE_CHECK} -o ${E}/xcreate_header_file $(create_header_file_SHARED_OBJECTS) $(create_header_file_OBJECTS)
@@ -100,6 +100,6 @@
##
## rule for create_header_file
##
-$O/%.header.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.header.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -32,7 +32,7 @@
$(EMPTY_MACRO)
meshfem3D_OBJECTS = \
- $O/meshfem3D_par.check.o \
+ $O/meshfem3D_par.check_module.o \
$O/meshfem3D.check.o \
$O/meshfem3D_models.check.o \
$O/add_missing_nodes.check.o \
@@ -125,7 +125,7 @@
# These files come from the shared directory
meshfem3D_SHARED_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/broadcast_computed_parameters.shared.o \
$O/calendar.shared.o \
@@ -204,15 +204,18 @@
#### rule for each .o file below
####
-$O/%.check.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.check_module.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check.o: $S/%.F90 ${SETUP}/constants.h
+$O/%.check.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.checkmpi.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.check.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
+ ${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
+
+$O/%.checkmpi.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.checkmpi.o: $S/%.F90 ${SETUP}/constants.h
+$O/%.checkmpi.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -32,7 +32,7 @@
$(EMPTY_MACRO)
shared_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/broadcast_computed_parameters.shared.o \
$O/calendar.shared.o \
@@ -70,6 +70,13 @@
$O/write_VTK_file.shared.o \
$(EMPTY_MACRO)
+shared_MODULES = \
+ $(FC_MODDIR)/constants.$(FC_MODEXT) \
+ $(FC_MODDIR)/shared_input_parameters.$(FC_MODEXT) \
+ $(FC_MODDIR)/shared_compute_parameters.$(FC_MODEXT) \
+ $(FC_MODDIR)/shared_parameters.$(FC_MODEXT) \
+ $(EMPTY_MACRO)
+
ADIOS_OBJECTS = \
$O/adios_helpers.shared.o \
$O/adios_manager.shared.o \
@@ -86,20 +93,24 @@
S := ${S_TOP}/src/shared
$(shared_OBJECTS): S = ${S_TOP}/src/shared
+
####
#### rule for each .o file below
####
+$O/%.shared_module.o: $S/%.f90 ${SETUP}/constants.h
+ ${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
+
##
## shared
##
-$O/%.shared.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.shared.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.shared.o: $S/%.F90 ${SETUP}/constants.h
+$O/%.shared.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
$O/%.cc.o: $S/%.c ${SETUP}/config.h
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-01 17:27:00 UTC (rev 22910)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-01 18:27:28 UTC (rev 22911)
@@ -50,7 +50,7 @@
# solver objects with statically allocated arrays; dependent upon
# values_from_mesher.h
specfem3D_OBJECTS += \
- $O/specfem3D_par.solverstatic.o \
+ $O/specfem3D_par.solverstatic_module.o \
$O/check_stability.solverstatic.o \
$O/compute_add_sources.solverstatic.o \
$O/compute_boundary_kernel.solverstatic.o \
@@ -103,7 +103,7 @@
# These files come from the shared directory
specfem3D_SHARED_OBJECTS = \
- $O/shared_par.shared.o \
+ $O/shared_par.shared_module.o \
$O/auto_ner.shared.o \
$O/broadcast_computed_parameters.shared.o \
$O/calendar.shared.o \
@@ -143,9 +143,9 @@
###
cuda_OBJECTS = \
- $O/assemble_MPI_scalar_cuda.cuda.o \
+ $O/assemble_MPI_scalar_cuda.cuda.o \
$O/assemble_MPI_vector_cuda.cuda.o \
- $O/check_fields_cuda.cuda.o \
+ $O/check_fields_cuda.cuda.o \
$O/compute_add_sources_elastic_cuda.cuda.o \
$O/compute_coupling_cuda.cuda.o \
$O/compute_forces_crust_mantle_cuda.cuda.o \
@@ -285,13 +285,16 @@
###
### specfem3D - optimized flags and dependence on values from mesher here
###
-$O/%.solverstatic.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h
+$O/%.solverstatic_module.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h
+$O/%.solverstatic.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic_openmp.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h
+$O/%.solverstatic.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
+ ${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
+
+$O/%.solverstatic_openmp.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
## DK DK add OpenMP compiler flag here if needed
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -qsmp=omp -o $@ $<
More information about the CIG-COMMITS
mailing list