[cig-commits] [commit] devel: fixed a bug I had introduced in OMP END CRITICAL (b5fe28d)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Jun 4 13:01:22 PDT 2014


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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/754300e5a26e2a5d17069e661645fe819a7857a1...cd83b686a7c6014e132933f685157d43151a665e

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

commit b5fe28d4948edb42e4aed09b3bc70b79855b301f
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Sun May 25 02:38:08 2014 +0200

    fixed a bug I had introduced in OMP END CRITICAL


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

b5fe28d4948edb42e4aed09b3bc70b79855b301f
 src/specfem3D/compute_forces_crust_mantle_Dev.F90 | 2 +-
 src/specfem3D/compute_forces_inner_core_Dev.F90   | 2 +-
 src/specfem3D/compute_forces_outer_core_Dev.F90   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/specfem3D/compute_forces_crust_mantle_Dev.F90 b/src/specfem3D/compute_forces_crust_mantle_Dev.F90
index 794a294..c01b907 100644
--- a/src/specfem3D/compute_forces_crust_mantle_Dev.F90
+++ b/src/specfem3D/compute_forces_crust_mantle_Dev.F90
@@ -355,7 +355,7 @@
 #ifdef FORCE_VECTORIZATION
     enddo
 #ifndef USE_OPENMP_ATOMIC_INSTEAD_OF_CRITICAL
-!$OMP CRITICAL
+!$OMP END CRITICAL
 #endif
 #else
         enddo
diff --git a/src/specfem3D/compute_forces_inner_core_Dev.F90 b/src/specfem3D/compute_forces_inner_core_Dev.F90
index 3239f01..19b819e 100644
--- a/src/specfem3D/compute_forces_inner_core_Dev.F90
+++ b/src/specfem3D/compute_forces_inner_core_Dev.F90
@@ -743,7 +743,7 @@
 #ifdef FORCE_VECTORIZATION
       enddo
 #ifndef USE_OPENMP_ATOMIC_INSTEAD_OF_CRITICAL
-!$OMP CRITICAL
+!$OMP END CRITICAL
 #endif
 #else
           enddo
diff --git a/src/specfem3D/compute_forces_outer_core_Dev.F90 b/src/specfem3D/compute_forces_outer_core_Dev.F90
index c4a84e7..81ef568 100644
--- a/src/specfem3D/compute_forces_outer_core_Dev.F90
+++ b/src/specfem3D/compute_forces_outer_core_Dev.F90
@@ -413,7 +413,7 @@
 #ifdef FORCE_VECTORIZATION
     enddo
 #ifndef USE_OPENMP_ATOMIC_INSTEAD_OF_CRITICAL
-!$OMP CRITICAL
+!$OMP END CRITICAL
 #endif
 #else
         enddo



More information about the CIG-COMMITS mailing list