[cig-commits] [commit] devel, master: build: Fix some module dependencies in mesher. (ee103b1)

[cig_noreply at geodynamics.org]

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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit ee103b11a643030e2fc29d03d4a5766f906cb3d0
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Fri Apr 18 22:59:05 2014 -0400

    build: Fix some module dependencies in mesher.


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

ee103b11a643030e2fc29d03d4a5766f906cb3d0
 src/meshfem3D/model_crust_1_0.f90 |  2 +-
 src/meshfem3D/rules.mk            | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/meshfem3D/model_crust_1_0.f90 b/src/meshfem3D/model_crust_1_0.f90
index b221400..16e0906 100644
--- a/src/meshfem3D/model_crust_1_0.f90
+++ b/src/meshfem3D/model_crust_1_0.f90
@@ -103,7 +103,7 @@
   crust1_rho(:,:,:) = ZERO
   crust1_thk(:,:,:) = ZERO
 
-  ! the variables read are declared and stored in structure model_crust_par
+  ! the variables read are declared and stored in structure model_crust_1_0_par
   if(myrank == 0) call read_crust_1_0_model()
 
   ! broadcast the information read on the master to the nodes
diff --git a/src/meshfem3D/rules.mk b/src/meshfem3D/rules.mk
index b9c7182..83db604 100644
--- a/src/meshfem3D/rules.mk
+++ b/src/meshfem3D/rules.mk
@@ -248,6 +248,22 @@ $(meshfem3D_OBJECTS): S = ${S_TOP}/src/meshfem3D
 #### rule for each .o file below
 ####
 
+## additional module dependencies
+
+$O/create_regions_mesh_adios.check_adios.o: \
+	$O/write_AVS_DX_global_data_adios.check_adios_module.o \
+	$O/write_AVS_DX_global_chunks_data_adios.check_adios_module.o \
+	$O/write_AVS_DX_global_faces_data_adios.check_adios_module.o \
+	$O/write_AVS_DX_surface_data_adios.check_adios_module.o
+
+$O/model_attenuation.check.o: \
+	$O/model_1dref.check.o \
+	$O/model_ak135.check.o \
+	$O/model_1066a.check.o \
+	$O/model_sea1d.check.o
+
+## general rules
+
 $O/%.check_module.o: $S/%.f90 $O/shared_par.shared_module.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
@@ -271,9 +287,9 @@ $O/%.check_adios_module.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_p
 $O/%.check_adios_module.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.check_adios.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o $O/write_AVS_DX_surface_data_adios.check_adios_module.o
+$O/%.check_adios.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
 
-$O/%.check_adios.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o $O/write_AVS_DX_surface_data_adios.check_adios_module.o
+$O/%.check_adios.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
 	${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<