Changeset 3632 for trunk/LMDZ.PLUTO/libf/phypluto/lymalpha.F90

Timestamp:

Feb 19, 2025, 2:26:32 PM (5 months ago)

Author:

afalco

Message:

Pluto: OpenMP fixes.
AF

File:

• trunk/LMDZ.PLUTO/libf/phypluto/lymalpha.F90 (modified) (3 diffs)

trunk/LMDZ.PLUTO/libf/phypluto/lymalpha.F90

@@ -2 +2 @@
       use datafile_mod
       use comcstfi_mod, only: pi
-      use mod_phys_lmdz_para, only : is_master, bcast
+      use mod_phys_lmdz_para, only : is_master
 
       implicit none
@@ -43 +43 @@
       integer ifine
       character(len=100) :: file_path
-      real,save :: lsdat(Nfine),fluxdat(Nfine)
-!$OMP THREADPRIVATE(lsdat,fluxdat)
+      ! real,save :: lsdat(Nfine),fluxdat(Nfine)
+      real,save,allocatable :: lsdat(:)
+      real,save,allocatable :: fluxdat(:)
 
 
@@ -50 +51 @@
 
       IF (firstcall) then
-        firstcall=.false.
-        file_path=trim(datadir)//'/sol_uv_flux.txt'
-        if (is_master) print*,file_path
-        open(222,file=file_path,form='formatted')
+         firstcall=.false.
 
-        if (is_master) then
-        do ifine=1,Nfine
-           read(222,*) lsdat(ifine), fluxdat(ifine)
-        enddo
-        close(222)
-        endif ! is_master
+!$OMP MASTER
+         file_path=trim(datadir)//'/sol_uv_flux.txt'
+         if (is_master) print*,file_path
 
-        call bcast(lsdat)
-        call bcast(fluxdat)
+         open(222,file=file_path,form='formatted')
+
+            if(.not.allocated(lsdat)) then
+               allocate(lsdat(Nfine))
+            endif
+            if(.not.allocated(fluxdat)) then
+               allocate(fluxdat(Nfine))
+            endif
+
+            do ifine=1,Nfine
+               read(222,*) lsdat(ifine), fluxdat(ifine)
+            enddo
+            close(222)
+
+!$OMP END MASTER
+!$OMP BARRIER
       ENDIF
-
 
       CALL interp_line(lsdat,fluxdat,Nfine,pls*180./pi,pflux,1)