[cig-commits] [commit] devel: temporary fix for a dependency problem in the Makefile detected by BuildBot (d266339)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/3141b3ecc17fdd63f7e5a4959c65863f4d61d82b...0b126d15bc519b73cda3f2f2889f540cdefb190a

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

commit d266339b78f3847d459e19c6a54decf6e72f85e6
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri Jul 4 12:16:40 2014 +0200

    temporary fix for a dependency problem in the Makefile detected by BuildBot


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

d266339b78f3847d459e19c6a54decf6e72f85e6
 Makefile.in                   |  3 ++-
 src/auxiliaries/rules.mk      | 13 ++++++++-----
 src/shared/write_VTK_data.f90 |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 65f7944..13cb7f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,13 +239,14 @@ all: default \
 	xcombine_vol_data \
 	xconvolve_source_timefunction \
 	xcreate_movie_shakemap_AVS_DX_GMT \
-	xmodel_update \
 	xsmooth_vol_data \
 	xsum_kernels \
 	xcheck_mesh_quality_CUBIT_Abaqus \
 	xconvert_skewness_to_angle \
 	xmultiply_CUBIT_Abaqus_mesh_by_1000 \
 	$(EMPTY_MACRO)
+##### DK DK July 2014 commented this out to temporarily avoid a dependency problem in the build system
+#########	xmodel_update \
 
 backup:
 	cp -rp src setup DATA/Par_file* Makefile bak
diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 4e70412..e19061f 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -36,21 +36,23 @@ auxiliaries_TARGETS = \
 	$E/xcombine_vol_data \
 	$E/xconvolve_source_timefunction \
 	$E/xcreate_movie_shakemap_AVS_DX_GMT \
-	$E/xmodel_update \
 	$E/xsmooth_vol_data \
 	$E/xsum_kernels \
 	$(EMPTY_MACRO)
+##### DK DK July 2014 commented this out to temporarily avoid a dependency problem in the build system
+###########	$E/xmodel_update \
 
 auxiliaries_OBJECTS = \
 	$O/combine_surf_data.aux.o \
 	$O/combine_vol_data.aux.o \
 	$O/convolve_source_timefunction.aux.o \
 	$O/create_movie_shakemap_AVS_DX_GMT.aux.o \
-	$O/model_update.aux.o \
-	$O/save_external_bin_m_up.aux.o \
 	$O/smooth_vol_data.aux.o \
 	$O/sum_kernels.aux.o \
 	$(EMPTY_MACRO)
+##### DK DK July 2014 commented this out to temporarily avoid a dependency problem in the build system
+#########	$O/save_external_bin_m_up.aux.o \
+#########	$O/model_update.aux.o \
 
 # These files come from the shared directory
 auxiliaries_SHARED_OBJECTS = \
@@ -78,11 +80,12 @@ auxiliaries_MODULES = \
 model_upd_auxiliaries_OBJECTS = \
 	$O/specfem3D_par.spec.o \
 	$O/pml_par.spec.o \
-	$O/model_update.aux.o \
 	$O/initialize_simulation.spec.o \
 	$O/read_mesh_databases.spec.o \
-	$O/save_external_bin_m_up.aux.o \
 	$(EMPTY_MACRO)
+##### DK DK July 2014 commented this out to temporarily avoid a dependency problem in the build system
+#########	$O/model_update.aux.o \
+########	$O/save_external_bin_m_up.aux.o \
 
 model_upd_auxiliaries_SHARED_OBJECTS = \
 	$O/check_mesh_resolution.shared.o \
diff --git a/src/shared/write_VTK_data.f90 b/src/shared/write_VTK_data.f90
index 6720b21..b1251a1 100644
--- a/src/shared/write_VTK_data.f90
+++ b/src/shared/write_VTK_data.f90
@@ -1,6 +1,6 @@
 !=====================================================================
 !
-!               S p e c f e m 3 D  V e r s i o n  2 . 1 YYYYYYYY
+!               S p e c f e m 3 D  V e r s i o n  2 . 1
 !               ---------------------------------------
 !
 !     Main historical authors: Dimitri Komatitsch and Jeroen Tromp