[cig-commits] [commit] devel, master: fixed a declaration problem in src/meshfem3D/compute_volumes_and_areas.F90 when configuring with --disable-vectorization Also created empty directory DATABASES_MPI/, since it is required by the default example in DATA/Par_file (70b7397)

[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 70b7397e67f092430beef2afb3013807fe8c81ee
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Mon Jun 16 03:43:38 2014 +0200

    fixed a declaration problem in src/meshfem3D/compute_volumes_and_areas.F90 when configuring with --disable-vectorization
    Also created empty directory DATABASES_MPI/, since it is required by the default example in DATA/Par_file


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

70b7397e67f092430beef2afb3013807fe8c81ee
 DATABASES_MPI/.gitignore                    | 4 ++++
 src/meshfem3D/compute_volumes_and_areas.F90 | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/DATABASES_MPI/.gitignore b/DATABASES_MPI/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/DATABASES_MPI/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/src/meshfem3D/compute_volumes_and_areas.F90 b/src/meshfem3D/compute_volumes_and_areas.F90
index 0bbce07..b9c0568 100644
--- a/src/meshfem3D/compute_volumes_and_areas.F90
+++ b/src/meshfem3D/compute_volumes_and_areas.F90
@@ -310,8 +310,12 @@
 
   use constants
 
-  use meshfem3D_par,only: x_observation1D,y_observation1D,z_observation1D, &
-     g_x1D,g_y1D,g_z1D,G_xx1D,G_yy1D,G_zz1D,G_xy1D,G_xz1D,G_yz1D,OUTPUT_FILES
+  use meshfem3D_par,only: OUTPUT_FILES, &
+#ifdef FORCE_VECTORIZATION
+     x_observation1D,y_observation1D,z_observation1D,g_x1D,g_y1D,g_z1D,G_xx1D,G_yy1D,G_zz1D,G_xy1D,G_xz1D,G_yz1D
+#else
+     x_observation,y_observation,z_observation,g_x,g_y,g_z,G_xx,G_yy,G_zz,G_xy,G_xz,G_yz
+#endif
 
   implicit none