[cig-commits] [commit] devel: updates rules.mk for tomography executables due to changes in src/shared/parallel.f90 (e1a1eff)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/3ad4ad0dda8bce0265d5fa9ed7567ee338346d81...133892d126073f174444ba2cb859e8cc72f5478e

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

commit e1a1eff0b7828bc02648bb6d7b2f1a168c5d65a7
Author: daniel peter <peterda at ethz.ch>
Date:   Tue Jan 6 12:47:17 2015 +0100

    updates rules.mk for tomography executables due to changes in src/shared/parallel.f90


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

e1a1eff0b7828bc02648bb6d7b2f1a168c5d65a7
 src/shared/model_topo_bathy.f90 |  2 +-
 src/shared/parallel.f90         |  2 ++
 src/tomography/rules.mk         | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/shared/model_topo_bathy.f90 b/src/shared/model_topo_bathy.f90
index 664c67f..5e3a0a9 100644
--- a/src/shared/model_topo_bathy.f90
+++ b/src/shared/model_topo_bathy.f90
@@ -56,6 +56,7 @@
 
     ! read/save topo file on master
     call read_topo_bathy_file(ibathy_topo)
+
     if (.not. ROLAND_SYLVAIN) call save_topo_bathy_database(ibathy_topo,LOCAL_PATH)
   endif
 
@@ -114,7 +115,6 @@
 
       ! stores in array
       ibathy_topo(itopo_x,itopo_y) = ival
-
     enddo
   enddo
   call close_file_abs(10)
diff --git a/src/shared/parallel.f90 b/src/shared/parallel.f90
index cb123eb..0bf6813 100644
--- a/src/shared/parallel.f90
+++ b/src/shared/parallel.f90
@@ -80,7 +80,9 @@ end module my_mpi
   ! we need to make sure that NUMBER_OF_SIMULTANEOUS_RUNS and BROADCAST_SAME_MESH_AND_MODEL are read before calling world_split()
   ! thus read the parameter file
   call MPI_COMM_RANK(MPI_COMM_WORLD,myrank,ier)
+
   if (myrank == 0) call read_parameter_file()
+
   ! broadcast parameters read from master to all processes
   my_local_mpi_comm_world = MPI_COMM_WORLD
   call bcast_all_singlei(NUMBER_OF_SIMULTANEOUS_RUNS)
diff --git a/src/tomography/rules.mk b/src/tomography/rules.mk
index dbe87c3..4243976 100644
--- a/src/tomography/rules.mk
+++ b/src/tomography/rules.mk
@@ -121,6 +121,9 @@ xadd_model_SHARED_OBJECTS = \
 	$O/parallel.sharedmpi.o \
 	$O/exit_mpi.shared.o \
 	$O/gll_library.shared.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 ##
@@ -200,6 +203,9 @@ xaddition_sem_SHARED_OBJECTS = \
 	$O/shared_par.shared_module.o \
 	$O/parallel.sharedmpi.o \
 	$O/exit_mpi.shared.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 ${E}/xaddition_sem: $(xaddition_sem_OBJECTS) $(xaddition_sem_SHARED_OBJECTS)
@@ -217,6 +223,9 @@ xdifference_sem_SHARED_OBJECTS = \
 	$O/shared_par.shared_module.o \
 	$O/parallel.sharedmpi.o \
 	$O/exit_mpi.shared.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 ${E}/xdifference_sem: $(xdifference_sem_OBJECTS) $(xdifference_sem_SHARED_OBJECTS)
@@ -238,6 +247,9 @@ xinterpolate_model_SHARED_OBJECTS = \
 	$O/lagrange_poly.shared.o \
 	$O/recompute_jacobian.solver.o \
 	$O/search_kdtree.shared.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 # extra dependencies
@@ -265,6 +277,9 @@ xsmooth_sem_SHARED_OBJECTS = \
 	$O/search_kdtree.shared.o \
 	$O/smooth_weights_vec.shared.o \
 	$O/write_VTK_file.shared.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 # extra dependencies
@@ -285,6 +300,9 @@ xsum_kernels_OBJECTS = \
 xsum_kernels_SHARED_OBJECTS = \
 	$O/shared_par.shared_module.o \
 	$O/parallel.sharedmpi.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 ${E}/xsum_kernels: $(xsum_kernels_OBJECTS) $(xsum_kernels_SHARED_OBJECTS)
@@ -302,6 +320,9 @@ xsum_preconditioned_kernels_OBJECTS = \
 xsum_preconditioned_kernels_SHARED_OBJECTS = \
 	$O/shared_par.shared_module.o \
 	$O/parallel.sharedmpi.o \
+	$O/param_reader.cc.o \
+	$O/read_parameter_file.shared.o \
+	$O/read_value_parameters.shared.o \
 	$(EMPTY_MACRO)
 
 ${E}/xsum_preconditioned_kernels: $(xsum_preconditioned_kernels_OBJECTS) $(xsum_preconditioned_kernels_SHARED_OBJECTS)