[cig-commits] [commit] devel: fixed the OpenMP compilation problem detected by David Luet (8a3f14d)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/955ba32eff11950629a6d27188c1e8329b473ced...8a3f14d7d473f70feb7f073639045daa35c587bc

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

commit 8a3f14d7d473f70feb7f073639045daa35c587bc
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Thu Jul 31 20:06:43 2014 +0200

    fixed the OpenMP compilation problem detected by David Luet


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

8a3f14d7d473f70feb7f073639045daa35c587bc
 Makefile.in                                        |  3 +-
 ...ined_compute_forces_viscoelastic_Dev_openmp.f90 |  0
 src/specfem3D/prepare_timerun.F90                  | 70 ++++++++++++----------
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8478498..5cebbcd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -161,7 +161,8 @@ GENCODE_35 = -gencode=arch=compute_35,code=\"sm_35,compute_35\"
 @COND_OPENMP_FALSE at COND_OPENMP_FFLAGS =
 
 # objects toggled between openmp and non-openmp version
- at COND_OPENMP_TRUE@COND_OPENMP_OBJECTS = $O/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.openmp.o
+#@COND_OPENMP_TRUE at COND_OPENMP_OBJECTS = $O/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.openmp.o
+ at COND_OPENMP_TRUE@COND_OPENMP_OBJECTS = 
 @COND_OPENMP_FALSE at COND_OPENMP_OBJECTS =
 
 
diff --git a/src/specfem3D/older_not_maintained_partial_OpenMP_port/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.f90 b/src/specfem3D/older_please_do_not_use_anymore_partial_OpenMP_port/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.f90
similarity index 100%
rename from src/specfem3D/older_not_maintained_partial_OpenMP_port/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.f90
rename to src/specfem3D/older_please_do_not_use_anymore_partial_OpenMP_port/older_not_maintained_compute_forces_viscoelastic_Dev_openmp.f90
diff --git a/src/specfem3D/prepare_timerun.F90 b/src/specfem3D/prepare_timerun.F90
index 5d99e41..5c4c629 100644
--- a/src/specfem3D/prepare_timerun.F90
+++ b/src/specfem3D/prepare_timerun.F90
@@ -1398,39 +1398,43 @@
     endif
 
     ! allocate cfe_Dev_openmp local arrays for OpenMP version
-    allocate(dummyx_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(dummyy_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(dummyz_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(dummyx_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(dummyy_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(dummyz_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempx1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempx2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempx3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempy1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempy2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempy3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempz1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempz2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(newtempz3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempx3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempy3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
-    allocate(tempz3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!! DK DK July 2014: I do not know who wrote the OpenMP version, but it is currently broken
+!! DK DK July 2014: because the arrays below are undeclared; I therefore need to comment them out
+!! DK DK July 2014: for now and put a stop statement instead
+    stop 'from DK DK, July 2014: the OpenMP version is currently broken here, not sure who wrote it, please fix it if possible'
+!   allocate(dummyx_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(dummyy_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(dummyz_loc(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(dummyx_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(dummyy_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(dummyz_loc_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempx1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempx2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempx3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempy1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempy2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempy3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempz1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempz2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(newtempz3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz1(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz2(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz3(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempx3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempy3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz1_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz2_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
+!   allocate(tempz3_att(NGLLX,NGLLY,NGLLZ,NUM_THREADS))
 
     ! set num_elem_colors array in case no mesh coloring is used
     if( .not. USE_MESH_COLORING_GPU ) then