[cig-commits] [commit] devel: renames constants_mod.f90 to shared_par.f90 (ba106cf)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Nov 28 14:14:05 PST 2014 

Repository : https://github.com/geodynamics/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/9a84d06c76e869f5276019e4f84affce23830a4d...8dce71b713c1fd0b510e7538fea0f2307c7b29e8

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

commit ba106cfcbeefca85fd1f4816092e49ef0883e645
Author: daniel peter <peterda at ethz.ch>
Date:   Thu Nov 27 12:21:45 2014 +0100

    renames constants_mod.f90 to shared_par.f90


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

ba106cfcbeefca85fd1f4816092e49ef0883e645
 src/auxiliaries/rules.mk                         | 14 +++++++-------
 src/check_mesh_quality_CUBIT_Abaqus/rules.mk     |  2 +-
 src/decompose_mesh/rules.mk                      | 10 +++++-----
 src/generate_databases/rules.mk                  | 10 +++++-----
 src/meshfem3D/earth_chunk_all_Utils.f90          |  4 ++--
 src/meshfem3D/rules.mk                           | 10 +++++-----
 src/shared/rules.mk                              | 14 +++++++-------
 src/shared/{constants_mod.f90 => shared_par.f90} |  0
 src/specfem3D/rules.mk                           | 24 ++++++++++++------------
 src/tomography/rules.mk                          | 12 ++++++------
 10 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index a153c9e..b4fd130 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -47,7 +47,7 @@ auxiliaries_OBJECTS = \
 
 # These files come from the shared directory
 auxiliaries_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/check_mesh_resolution.shared.o \
 	$O/create_name_database.shared.o \
 	$O/exit_mpi.shared.o \
@@ -76,7 +76,7 @@ combine_surf_data_auxiliaries_OBJECTS = \
 	$(EMPTY_MACRO)
 
 combine_surf_data_auxiliaries_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/param_reader.cc.o \
 	$O/write_c_binary.cc.o \
 	$(EMPTY_MACRO)
@@ -93,7 +93,7 @@ combine_vol_data_auxiliaries_OBJECTS = \
 	$(EMPTY_MACRO)
 
 combine_vol_data_auxiliaries_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/read_parameter_file.shared.o \
 	$O/read_value_parameters.shared.o \
 	$O/param_reader.cc.o \
@@ -125,7 +125,7 @@ create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS = \
 	$(EMPTY_MACRO)
 
 create_movie_shakemap_AVS_DX_GMT_auxiliaries_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/get_global.shared.o \
 	$O/param_reader.cc.o \
 	$O/read_parameter_file.shared.o \
@@ -202,7 +202,7 @@ endif
 ## auxiliaries
 ##
 
-$O/%.aux.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.aux.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 
@@ -210,9 +210,9 @@ $O/%.aux.o: $S/%.f90 $O/constants_mod.shared_module.o
 ### ADIOS compilation
 ###
 
-$O/%.aux_adios.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.aux_adios.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.aux_noadios.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.aux_noadios.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
diff --git a/src/check_mesh_quality_CUBIT_Abaqus/rules.mk b/src/check_mesh_quality_CUBIT_Abaqus/rules.mk
index 205d89e..87ffa68 100644
--- a/src/check_mesh_quality_CUBIT_Abaqus/rules.mk
+++ b/src/check_mesh_quality_CUBIT_Abaqus/rules.mk
@@ -89,7 +89,7 @@ $E/xmultiply_CUBIT_Abaqus_mesh_by_1000: $O/multiply_CUBIT_Abaqus_mesh_by_1000.ch
 #### rule to build each .o file below
 ####
 
-$O/%.check.o: $S/%.f90 $O/constants_mod.shared_module.o  $O/unused_mod.shared_module.o
+$O/%.check.o: $S/%.f90 $O/shared_par.shared_module.o  $O/unused_mod.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 
diff --git a/src/decompose_mesh/rules.mk b/src/decompose_mesh/rules.mk
index 4bc8f6d..0225278 100644
--- a/src/decompose_mesh/rules.mk
+++ b/src/decompose_mesh/rules.mk
@@ -55,7 +55,7 @@ decompose_mesh_MODULES = \
 	$(EMPTY_MACRO)
 
 decompose_mesh_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/param_reader.cc.o \
 	$O/read_parameter_file.shared.o \
 	$O/read_value_parameters.shared.o \
@@ -100,8 +100,8 @@ endif
 ### Module dependencies
 ###
 
-$O/decompose_mesh.dec.o: $O/part_decompose_mesh.dec.o $O/fault_scotch.dec.o ${SCOTCH_DIR}/include/scotchf.h $O/constants_mod.shared_module.o
-$O/program_decompose_mesh.dec.o: $O/decompose_mesh.dec.o $O/constants_mod.shared_module.o
+$O/decompose_mesh.dec.o: $O/part_decompose_mesh.dec.o $O/fault_scotch.dec.o ${SCOTCH_DIR}/include/scotchf.h $O/shared_par.shared_module.o
+$O/program_decompose_mesh.dec.o: $O/decompose_mesh.dec.o $O/shared_par.shared_module.o
 
 
 #######################################
@@ -110,10 +110,10 @@ $O/program_decompose_mesh.dec.o: $O/decompose_mesh.dec.o $O/constants_mod.shared
 #### rule to build each .o file below
 ####
 
-$O/%.dec.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.dec.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} $(SCOTCH_INC) -c -o $@ $<
 
-$O/%.dec.o: $S/%.F90 $O/constants_mod.shared_module.o
+$O/%.dec.o: $S/%.F90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} $(SCOTCH_INC) -c -o $@ $<
 
 
diff --git a/src/generate_databases/rules.mk b/src/generate_databases/rules.mk
index dd63f3d..5d09065 100644
--- a/src/generate_databases/rules.mk
+++ b/src/generate_databases/rules.mk
@@ -89,7 +89,7 @@ generate_databases_MODULES = \
 
 generate_databases_SHARED_OBJECTS = \
 	$O/assemble_MPI_scalar.shared.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/check_mesh_resolution.shared.o \
 	$O/create_name_database.shared.o \
 	$O/create_serial_name_database.shared.o \
@@ -253,10 +253,10 @@ $O/adios_helpers.shared_adios.o: \
 ####
 
 
-$O/%.gen.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.gen.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.mpi_gen.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.mpi_gen.o: $S/%.f90 $O/shared_par.shared_module.o
 	${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 
@@ -267,10 +267,10 @@ $O/%.genc.o: $S/%.c
 ### ADIOS compilation
 ###
 
-$O/%.gen_adios.o: $S/%.F90 $O/constants_mod.shared_module.o
+$O/%.gen_adios.o: $S/%.F90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.gen_adios.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.gen_adios.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 $O/%.gen_noadios.o: $S/%.F90
diff --git a/src/meshfem3D/earth_chunk_all_Utils.f90 b/src/meshfem3D/earth_chunk_all_Utils.f90
index 18b09eb..e2d2db2 100644
--- a/src/meshfem3D/earth_chunk_all_Utils.f90
+++ b/src/meshfem3D/earth_chunk_all_Utils.f90
@@ -23,8 +23,8 @@
 ! with this program; if not, write to the Free Software Foundation, Inc.,
 ! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 !
-!===========================================================================
-!
+!=====================================================================
+
 
   subroutine earth_chunk_ReadIasp91(vp,vs,rho,rb,n)
 
diff --git a/src/meshfem3D/rules.mk b/src/meshfem3D/rules.mk
index 79a5d3e..15219b3 100644
--- a/src/meshfem3D/rules.mk
+++ b/src/meshfem3D/rules.mk
@@ -70,7 +70,7 @@ meshfem3D_MODULES = \
 
 meshfem3D_SHARED_OBJECTS = \
 	$O/create_name_database.shared.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/exit_mpi.shared.o \
 	$O/get_global.shared.o \
 	$O/get_shape3D.shared.o \
@@ -145,7 +145,7 @@ $E/xmeshfem3D: $(XMESHFEM_OBJECTS)
 $O/meshfem3D.mesh.o: $O/create_regions_mesh.mesh.o $O/read_mesh_parameter_file.mesh.o
 
 ## adios
-$O/meshfem3D_adios_stubs.mesh_noadios.o: $O/constants_mod.shared_module.o $O/unused_mod.shared_module.o $O/adios_manager_stubs.shared_noadios.o
+$O/meshfem3D_adios_stubs.mesh_noadios.o: $O/shared_par.shared_module.o $O/unused_mod.shared_module.o $O/adios_manager_stubs.shared_noadios.o
 
 $O/save_databases_adios.mesh_adios.o: $O/safe_alloc_mod.shared.o $(adios_meshfem3D_PREOBJECTS)
 $O/create_regions_mesh.mesh.o: $(adios_meshfem3D_PREOBJECTS)
@@ -159,7 +159,7 @@ $O/adios_helpers.shared_adios.o: \
 #### rule to build each .o file below
 ####
 
-$O/%.mesh.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.mesh.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 
@@ -167,10 +167,10 @@ $O/%.mesh.o: $S/%.f90 $O/constants_mod.shared_module.o
 ### ADIOS compilation
 ###
 
-$O/%.mesh_adios.o: $S/%.F90 $O/constants_mod.shared_module.o
+$O/%.mesh_adios.o: $S/%.F90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.mesh_adios.o: $S/%.f90 $O/constants_mod.shared_module.o
+$O/%.mesh_adios.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90}  -c -o $@ $<
 
 $O/%.mesh_noadios.o: $S/%.F90
diff --git a/src/shared/rules.mk b/src/shared/rules.mk
index 71e4e69..a96567e 100644
--- a/src/shared/rules.mk
+++ b/src/shared/rules.mk
@@ -39,7 +39,7 @@ shared_TARGETS = \
 shared_OBJECTS = \
 	$O/assemble_MPI_scalar.shared.o \
 	$O/check_mesh_resolution.shared.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/create_name_database.shared.o \
 	$O/create_serial_name_database.shared.o \
 	$O/define_derivation_matrices.shared.o \
@@ -129,7 +129,7 @@ endif
 #### rule for each .o file below
 ####
 
-$O/unused_mod.shared_module.o: $O/constants_mod.shared_module.o
+$O/unused_mod.shared_module.o: $O/shared_par.shared_module.o
 
 ##
 ## shared
@@ -138,13 +138,13 @@ $O/unused_mod.shared_module.o: $O/constants_mod.shared_module.o
 $O/%.shared_module.o: $S/%.f90 ${SETUP}/constants.h
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.shared.o: $S/%.f90 $O/constants_mod.shared_module.o $O/unused_mod.shared_module.o
+$O/%.shared.o: $S/%.f90 $O/shared_par.shared_module.o $O/unused_mod.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.shared.o: $S/%.F90 $O/constants_mod.shared_module.o $O/unused_mod.shared_module.o
+$O/%.shared.o: $S/%.F90 $O/shared_par.shared_module.o $O/unused_mod.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h $O/constants_mod.shared_module.o
+$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
 	${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 
@@ -155,10 +155,10 @@ $O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h $O/constants_mod.shared_module.o
 $O/%.shared_adios_module.o: $S/%.f90
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.shared_adios.o: $S/%.f90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/constants_mod.shared_module.o
+$O/%.shared_adios.o: $S/%.f90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.shared_adios.o: $S/%.F90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/constants_mod.shared_module.o
+$O/%.shared_adios.o: $S/%.F90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 $O/%.shared_noadios.o: $S/%.f90
diff --git a/src/shared/constants_mod.f90 b/src/shared/shared_par.f90
similarity index 100%
rename from src/shared/constants_mod.f90
rename to src/shared/shared_par.f90
diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 301c71e..a6b86d5 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -43,7 +43,7 @@ specfem3D_TARGETS = \
 
 
 specfem3D_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/assemble_MPI_vector.spec.o \
 	$O/check_stability.spec.o \
 	$O/fault_solver_common.spec.o \
@@ -302,14 +302,14 @@ endif
 ### Module dependencies
 ###
 
-$O/specfem3D_par.spec.o: $O/constants_mod.shared_module.o $O/unused_mod.shared_module.o
-$O/compute_stacey_acoustic.spec.o: $O/constants_mod.shared_module.o
-$O/compute_stacey_poroelastic.spec.o: $O/constants_mod.shared_module.o
-$O/locate_receivers.spec.o: $O/constants_mod.shared_module.o
-$O/make_gravity.spec.o: $O/constants_mod.shared_module.o
-$O/multiply_arrays_source.spec.o: $O/constants_mod.shared_module.o
-$O/noise_tomography.spec.o: $O/constants_mod.shared_module.o
-$O/write_output_ASCII.spec.o: $O/constants_mod.shared_module.o
+$O/specfem3D_par.spec.o: $O/shared_par.shared_module.o $O/unused_mod.shared_module.o
+$O/compute_stacey_acoustic.spec.o: $O/shared_par.shared_module.o
+$O/compute_stacey_poroelastic.spec.o: $O/shared_par.shared_module.o
+$O/locate_receivers.spec.o: $O/shared_par.shared_module.o
+$O/make_gravity.spec.o: $O/shared_par.shared_module.o
+$O/multiply_arrays_source.spec.o: $O/shared_par.shared_module.o
+$O/noise_tomography.spec.o: $O/shared_par.shared_module.o
+$O/write_output_ASCII.spec.o: $O/shared_par.shared_module.o
 
 $O/assemble_MPI_vector.spec.o: $O/specfem3D_par.spec.o
 $O/check_stability.spec.o: $O/specfem3D_par.spec.o
@@ -340,7 +340,7 @@ $O/locate_receivers.spec.o: $O/specfem3D_par.spec.o
 $O/pml_par.spec.o: $O/specfem3D_par.spec.o
 $O/setup_GLL_points.spec.o: $O/specfem3D_par.spec.o
 $O/setup_movie_meshes.spec.o: $O/specfem3D_par.spec.o
-$O/setup_sources_receivers.spec.o: $O/specfem3D_par.spec.o $O/constants_mod.shared_module.o 
+$O/setup_sources_receivers.spec.o: $O/specfem3D_par.spec.o $O/shared_par.shared_module.o
 $O/specfem3D.spec.o: $O/specfem3D_par.spec.o
 $O/save_adjoint_kernels.spec.o: $O/specfem3D_par.spec.o
 $O/write_movie_output.spec.o: $O/specfem3D_par.spec.o
@@ -348,8 +348,8 @@ $O/write_output_SU.spec.o: $O/specfem3D_par.spec.o
 $O/write_seismograms.spec.o: $O/specfem3D_par.spec.o
 
 ## pml
-$O/compute_coupling_acoustic_el.spec.o: $O/constants_mod.shared_module.o $O/pml_par.spec.o
-$O/compute_coupling_viscoelastic_ac.spec.o: $O/constants_mod.shared_module.o $O/pml_par.spec.o
+$O/compute_coupling_acoustic_el.spec.o: $O/shared_par.shared_module.o $O/pml_par.spec.o
+$O/compute_coupling_viscoelastic_ac.spec.o: $O/shared_par.shared_module.o $O/pml_par.spec.o
 $O/compute_forces_acoustic_calling_routine.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
 $O/compute_forces_acoustic_Dev.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
 $O/compute_forces_acoustic_noDev.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
diff --git a/src/tomography/rules.mk b/src/tomography/rules.mk
index 7e63d18..314b8f7 100644
--- a/src/tomography/rules.mk
+++ b/src/tomography/rules.mk
@@ -123,7 +123,7 @@ xadd_model_SHARED_OBJECTS = \
 	$O/specfem3D_par.spec.o \
 	$O/pml_par.spec.o \
 	$O/read_mesh_databases.spec.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/create_name_database.shared.o \
 	$O/exit_mpi.shared.o \
 	$O/gll_library.shared.o \
@@ -168,7 +168,7 @@ xmodel_update_SHARED_OBJECTS = \
 	$O/pml_par.spec.o \
 	$O/initialize_simulation.spec.o \
 	$O/read_mesh_databases.spec.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/check_mesh_resolution.shared.o \
 	$O/create_name_database.shared.o \
 	$O/exit_mpi.shared.o \
@@ -231,7 +231,7 @@ xsmooth_sem_SHARED_OBJECTS = \
 	$O/specfem3D_par.spec.o \
 	$O/pml_par.spec.o \
 	$O/read_mesh_databases.spec.o \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/check_mesh_resolution.shared.o \
 	$O/create_name_database.shared.o \
 	$O/exit_mpi.shared.o \
@@ -259,7 +259,7 @@ xsum_kernels_OBJECTS = \
 	$(EMPTY_MACRO)
 
 xsum_kernels_SHARED_OBJECTS = \
-	$O/constants_mod.shared_module.o \
+	$O/shared_par.shared_module.o \
 	$O/param_reader.cc.o \
 	$O/read_parameter_file.shared.o \
 	$O/read_value_parameters.shared.o \
@@ -289,13 +289,13 @@ ${E}/xsum_preconditioned_kernels: $(xsum_preconditioned_kernels_OBJECTS) $(xsum_
 ###
 ### Module dependencies
 ###
-$O/tomography_par.tomo_module.o: $O/constants_mod.shared_module.o
+$O/tomography_par.tomo_module.o: $O/shared_par.shared_module.o
 
 ####
 #### rule for each .o file below
 ####
 
-$O/%.tomo_module.o: $S/%.f90 ${SETUP}/constants_tomography.h $O/constants_mod.shared_module.o
+$O/%.tomo_module.o: $S/%.f90 ${SETUP}/constants_tomography.h $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
 $O/%.tomo.o: $S/%.f90 ${SETUP}/constants_tomography.h $O/tomography_par.tomo_module.o

More information about the CIG-COMMITS mailing list