Changeset 2526 for LMDZ5/trunk

Timestamp:

May 27, 2016, 12:13:40 AM (9 years ago)

Author:

oboucher

Message:

Adding OpenMP parallelization to both reaerosolstrato routines

Location:

LMDZ5/trunk/libf/phylmd

Files:

• readaerosolstrato.F90 (modified) (5 diffs)
• rrtm/readaerosolstrato_rrtm.F90 (modified) (5 diffs)

LMDZ5/trunk/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

LMDZ5/trunk/libf/phylmd/rrtm/readaerosolstrato_rrtm.F90

@@ -11 +11 @@
     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, 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
@@ -79 +80 @@
     IF (.not.ALLOCATED(sum_tau_aer_strat)) ALLOCATE(sum_tau_aer_strat(klon))
 
+!--we only read monthly strat aerosol data
     IF (debut.OR.mth_cur.NE.mth_pre) THEN
 
-    IF (is_mpi_root) THEN
+!--only root reads the data
+    IF (is_mpi_root.AND.is_omp_root) THEN
 
     IF (nbands_sw_rrtm.NE.6) THEN 
@@ -145 +148 @@
     CALL grid2dTo1d_glo(tauaerstrat_mois,tauaerstrat_mois_glo)
 
-    ENDIF !--is_mpi_root
+    ENDIF !--is_mpi_root and is_omp_root
+
+!$OMP BARRIER
 
 !--keep memory of previous month
@@ -153 +158 @@
     CALL scatter(tauaerstrat_mois_glo,tau_aer_strat)
 
-    IF (is_mpi_root) THEN
+    IF (is_mpi_root.AND.is_omp_root) THEN
 !
     DEALLOCATE(tauaerstrat)
@@ -159 +164 @@
     DEALLOCATE(tauaerstrat_mois_glo)
 !
-    ENDIF !--is_mpi_root
+    ENDIF !--is_mpi_root and is_omp_root
+
+!$OMP BARRIER
 
     ENDIF !--debut ou nouveau mois