Changeset 2542 for LMDZ5/branches/testing/libf/phylmd/readaerosolstrato.F90

Timestamp:

Jun 6, 2016, 4:04:57 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2487:2541 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/readaerosolstrato.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/readaerosolstrato.F90

@@ -9 +9 @@
                                  grid2dto1d_glo
     USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
+    USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
     USE mod_phys_lmdz_para 
     USE phys_state_var_mod
@@ -64 +65 @@
     IF (debut.OR.mth_cur.NE.mth_pre) THEN
 
-    IF (is_mpi_root) THEN
+!--only root reads
+    IF (is_mpi_root.AND.is_omp_root) THEN
 
     IF (nbands.NE.2) THEN 
@@ -128 +130 @@
     CALL grid2dTo1d_glo(tauaerstrat_mois,tauaerstrat_mois_glo)
 
-    ENDIF !--is_mpi_root
+    ENDIF !--is_mpi_root and is_omp_root
+
+!$OMP BARRIER
 
 !--scatter on all proc
@@ -136 +140 @@
     mth_pre=mth_cur
 !
-    IF (is_mpi_root) THEN
+    IF (is_mpi_root.AND.is_omp_root) THEN
 !
     DEALLOCATE(tauaerstrat)
@@ -142 +146 @@
     DEALLOCATE(tauaerstrat_mois_glo)
 !
-    ENDIF !-is_mpi_root
+    ENDIF !-is_mpi_root and is_omp_root
+
+!$OMP BARRIER
 
     ENDIF !--debut ou nouveau mois