Changeset 3990 for trunk/LMDZ.GENERIC/libf

Timestamp:

Dec 12, 2025, 5:36:11 PM (3 months ago)

Author:

emillour

Message:

Generic PCM:
OpenMP bug fix in ave_stelspec.F90 (line counting strategy should only be done
by the master thread). While at it turned ave_stelspec and setspv into modules.
EM

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• ave_stelspec.F90 (modified) (8 diffs)
• physiq_mod.F90 (modified) (1 diff)
• setspv.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/ave_stelspec.F90

@@ +1 @@
+      module ave_stelspec_mod
+      
+      implicit none
+      
+      contains
+      
       subroutine ave_stelspec(STELLAR)
 
@@ -38 +44 @@
       integer ifine,band
 
-      real,allocatable,save :: lam(:),stel_f(:)         !read by master
+      real,allocatable,save :: lam(:),stel_f(:) ! read by master thread
+                                                ! but used by all threads
       real lamm,lamp
       real dl
@@ -50 +57 @@
       
       integer :: ios ! file opening/reading status
+      logical :: file_exists
 
       STELLAR(:)=0.0
@@ -93 +101 @@
          write(*,*) 'Please use ',1,' and only ',1,' header line in ',trim(stelspec_file)
 
-         ! Opening file
+         ! Check the target file is there
          file_path = trim(datadir)//'/stellar_spectra/'//stelspec_file
          print*, 'stellar flux : ', file_path
-         OPEN(UNIT=110,FILE=file_path,STATUS='old',iostat=ios)
+         inquire(FILE=file_path,EXIST=file_exists)         
    
-         if (ios /= 0) THEN
+         if (.not.file_exists) THEN
            write(*,*)'Beware that startype is now deprecated, you should use '
            write(*,*)'stelspec_file and tstellar to define the input stellar spectrum.'
@@ -116 +124 @@
          end if
 
+!$OMP MASTER
+         ! Open the file
+         OPEN(UNIT=110,FILE=file_path,STATUS='old',iostat=ios)
          ! Get number of line in the file
          READ(110,*) ! skip first line header just in case
@@ -127 +138 @@
          READ(110,*) ! skip first line header just in case
 
-!$OMP MASTER
          allocate(lam(Nfine),stel_f(Nfine))
 
@@ -158 +168 @@
 !$OMP BARRIER
 !$OMP MASTER
-         if (allocated(lam)) deallocate(lam)
-         if (allocated(stel_f)) deallocate(stel_f)
+         deallocate(lam)
+         deallocate(stel_f)
 !$OMP END MASTER
 !$OMP BARRIER         
@@ -165 +175 @@
 
       end subroutine ave_stelspec
+      
+      end module ave_stelspec_mod

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -24 +24 @@
       use radcommon_h, only: sigma, glat, grav, BWNV, WNOI, DWNI, DWNV, WNOV
       use suaer_corrk_mod, only: suaer_corrk
+      use setspv_mod, only: setspv
       use radii_mod, only: h2o_reffrad, co2_reffrad
       use aerosol_mod, only: iniaerosol, iaero_co2, iaero_h2o

trunk/LMDZ.GENERIC/libf/phystd/setspv.F90

@@ +1 @@
+      module setspv_mod
+      
+      implicit none
+      
+      contains
+      
       subroutine setspv
 
@@ -27 +33 @@
       use datafile_mod, only: datadir
       use callkeys_mod, only: Fat1AU
+      use ave_stelspec_mod, only: ave_stelspec
 
       implicit none
@@ -132 +139 @@
       print*,' '
 
-      RETURN
     END subroutine setspv
+    
+    end module setspv_mod
+