Changeset 6122 for LMDZ6/trunk/libf

Timestamp:

Mar 23, 2026, 11:30:30 PM (9 days ago)

Author:

lguez

Message:

Set variables to OpenMP threadprivate

Set press_cen_climoz, press_edg_climoz and time_climoz in
procedure physiq to OpenMP threadprivate. We then have to call
open_climoz for each thread.

Location:

LMDZ6/trunk/libf/phylmd

Files:

• open_climoz_m.f90 (modified) (4 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/open_climoz_m.f90

@@ -14 +14 @@
     USE netcdf95, ONLY: nf95_open, nf95_close, nf95_gw_var, nf95_inq_varid
     USE netcdf,   ONLY: nf90_nowrite
+    use mod_phys_lmdz_omp_data, only: is_omp_root
     USE mod_phys_lmdz_mpi_data,      ONLY: is_mpi_root
-    USE mod_phys_lmdz_mpi_transfert, ONLY: bcast_mpi
+    USE mod_phys_lmdz_transfert_para, ONLY: bcast
     USE phys_cal_mod,                ONLY: calend, year_len, year_cur
     !-------------------------------------------------------------------------------
@@ -26 +27 @@
     !-------------------------------------------------------------------------------
     INTEGER, INTENT(OUT):: ncid      !--- "climoz_LMDZ.nc" identifier
-    ! Following arguments are OpenMP shared:
     REAL, allocatable, intent(out):: press_in_cen(:) !--- at cells centers
     REAL, allocatable, INTENT(OUT):: press_in_edg(:) !--- at the interfaces (pressure intervals)
@@ -44 +44 @@
     WRITE(lunout,*)"Entering routine "//TRIM(sub)
 
-    IF(is_mpi_root) THEN
+    IF (is_mpi_root .and. is_omp_root) THEN
 
        !--- OPEN FILE, READ PRESSURE LEVELS AND TIME VECTOR
@@ -87 +87 @@
           WRITE(lunout,*)TRIM(sub)//': Interpolating O3 field directly on gcm levels.'
        END IF
+    END IF
 
-    END IF
-    CALL bcast_mpi(nlev)
-    IF(.NOT.is_mpi_root) ALLOCATE(press_in_cen(nlev  )); CALL bcast_mpi(press_in_cen)
-    IF(.NOT.is_mpi_root) ALLOCATE(press_in_edg(nlev+1)); CALL bcast_mpi(press_in_edg)
-    CALL bcast_mpi(ntim)
-    IF(.NOT.is_mpi_root) ALLOCATE(time_in(ntim));        CALL bcast_mpi(time_in)
+    CALL bcast(nlev)
+    CALL bcast(ntim)
+
+    IF (.NOT. is_mpi_root .or. .not. is_omp_root) then
+       ALLOCATE(press_in_cen(nlev  ))
+       ALLOCATE(press_in_edg(nlev+1))
+       ALLOCATE(time_in(ntim))
+    end IF
+
+    CALL bcast(press_in_cen)
+    CALL bcast(press_in_edg)
+    CALL bcast(time_in)
 
   END SUBROUTINE open_climoz

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -1070 +1070 @@
     !     climatology and the daylight climatology
     INTEGER,SAVE :: ncid_climoz                ! NetCDF file identifier
-    !$OMP THREADPRIVATE(read_climoz, ncid_climoz)
-
-    !  Following variables are OpenMP shared
     REAL, ALLOCATABLE, SAVE :: press_cen_climoz(:) ! Pressure levels
     REAL, ALLOCATABLE, SAVE :: press_edg_climoz(:) ! Edges of pressure intervals
     REAL, ALLOCATABLE, SAVE :: time_climoz(:)      ! Time vector
+    !$OMP THREADPRIVATE(read_climoz, ncid_climoz, press_cen_climoz)
+    !$OMP THREADPRIVATE(press_edg_climoz, time_climoz)
 
     CHARACTER(LEN=13), PARAMETER :: vars_climoz(2) &
@@ -2124 +2123 @@
        ENDIF
 
-       !$omp master
        IF (read_climoz >= 1) CALL open_climoz(ncid_climoz, press_cen_climoz,   &
             press_edg_climoz, time_climoz, ok_daily_climoz, adjust_tropopause)
-       !$omp end master
        !
        !IM betaCRF