Changeset 2550 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jul 9, 2021, 5:31:31 PM (3 years ago)

Author:

emillour

Message:

Generic GCM:
Some OpenMP fixes in routines initracer.F, nonoro_gwd_ran_mod.F90,
phys_state_var_mod.F90 and sugas_corrk.F90
EM

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• initracer.F (modified) (4 diffs)
• nonoro_gwd_ran_mod.F90 (modified) (1 diff)
• phys_state_var_mod.F90 (modified) (1 diff)
• sugas_corrk.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/initracer.F

@@ -5 +5 @@
       USE callkeys_mod, only: water
       USE recombin_corrk_mod, ONLY: ini_recombin
+      USE mod_phys_lmdz_para, only: is_master, bcast
       IMPLICIT NONE
 c=======================================================================
@@ -45 +46 @@
 c-----------------------------------------------------------------------
 
-      moderntracdef=.false. ! For modern traceur.def (default false, old type)
-
-      open(407, form = 'formatted', status = 'old',
+      if (is_master) then ! only the master proc/thread needs do this
+
+        moderntracdef=.false. ! For modern traceur.def (default false, old type)
+
+        open(407, form = 'formatted', status = 'old',
      $          file = 'traceur.def', iostat=ierr)
-      if (ierr /=0) then
-        call abort_physic('initracer',
-     $  'Problem in opening traceur.def',1)
-      end if
+        if (ierr /=0) then
+          call abort_physic('initracer',
+     $    'Problem in opening traceur.def',1)
+        end if
 !! - Modif. by JVO and YJ for modern planetary traceur.def ---------------
-       READ(407,'(A)') tracline
-       IF (trim(tracline).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def
+        READ(407,'(A)') tracline
+        IF (trim(tracline).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def
           READ(tracline,*) nqtot ! Try standard traceur.def
-       ELSE
+        ELSE
          moderntracdef = .true.
          DO
@@ -76 +79 @@
            ENDIF
          ENDDO
-       ENDIF ! if modern or standard traceur.def
+        ENDIF ! if modern or standard traceur.def
+       
+       endif ! of if (is_master)
+       
+       ! share the information with other procs/threads (if any)
+       CALL bcast(nqtot)
+       CALL bcast(moderntracdef)
+       
 !! -----------------------------------------------------------------------
        !! For the moment number of tracers in dynamics and physics are equal
@@ -396 +406 @@
       ! Get data of tracers
       do iq=1,nqtot
-        read(407,'(A)') tracline
+        if (is_master) read(407,'(A)') tracline
+        call bcast(tracline)
         call get_tracdat(iq, tracline)
       enddo
 
-      close(407)
+      if (is_master) close(407)
 
       ! Calculate number of species in the chemistry

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

@@ -7 +7 @@
       REAL, allocatable, save :: east_gwstress(:, :) ! Eastward stress profile
       REAL, allocatable, save :: west_gwstress(:, :) ! Westward stress profile
-
+!$OMP THREADPRIVATE(du_nonoro_gwd,dv_nonoro_gwd,east_gwstress,west_gwstress)
 CONTAINS
 

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

@@ -107 +107 @@
       real,dimension(:,:),allocatable,save :: dEzRadsw  ! Radiative heating (W.m-2)
       real,dimension(:,:),allocatable,save :: dEzRadlw  ! Radiative heating (W.m-2)
-!$OMP THREADPRIVATE(dEzdiff,dEzdiffs,dEzRadsw,dEzRadlw)
+!$OMP THREADPRIVATE(dEzdiff,dEdiff,dEdiffs,dEzRadsw,dEzRadlw)
 
       real,dimension(:),allocatable,save :: madjdE      ! Heat from moistadj (W.m-2)

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

@@ -65 +65 @@
       if (.not. moderntracdef) use_premix=.true. ! Added by JVO for compatibility with 'old' traceur.def
       
+!$OMP MASTER
       if (use_premix) then ! use_premix flag added by JVO, thus if pure recombining then premix is skipped
 
@@ -84 +85 @@
       endif
 
-!$OMP MASTER
       ! check that database matches varactive toggle
       open(111,file=TRIM(file_path),form='formatted')
@@ -765 +765 @@
 !$OMP BARRIER
 
-      return
     end subroutine sugas_corrk