Changeset 1851

Timestamp:

Aug 29, 2013, 4:48:39 PM (11 years ago)

Author:

Ehouarn Millour

Message:

OpenMP bug fix in iniaqua: local variables are shared by all threads only if they are static (ie with "save" attribute).
While at it, changed phyaqua.F into module phyaqua_mod.F
EM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• iniphysiq.F (modified) (1 diff)
• phyaqua_mod.F (moved) (moved from LMDZ5/trunk/libf/phylmd/phyaqua.F) (14 diffs)
• physiq.F (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/iniphysiq.F

@@ -14 +14 @@
      &                               klon_omp_end,klon_mpi_begin
       USE comgeomphy, only : airephy,cuphy,cvphy,rlond,rlatd
-
+      USE phyaqua_mod, only: iniaqua
       IMPLICIT NONE
 c

LMDZ5/trunk/libf/phylmd/phyaqua_mod.F

@@ +1 @@
+      module phyaqua_mod
 ! Routines complementaires pour la physique planetaire.
-
+      implicit none
+
+      contains
 
       subroutine iniaqua(nlon,latfi,lonfi,iflag_phys)
@@ -89 +92 @@
       integer, save::  read_climoz=0 ! read ozone climatology
 
-! intermediate variables to use getin
-      integer :: nbapp_rad_omp
-      real :: co2_ppm_omp,solaire_omp
-      logical :: alb_ocean_omp
-      real :: rugos_omp
+! intermediate variables to use getin (need to be "save" to be shared by all threads)
+      integer,save :: nbapp_rad_omp
+      real,save :: co2_ppm_omp,solaire_omp
+      logical,save :: alb_ocean_omp
+      real,save :: rugos_omp
 !-------------------------------------------------------------------------
 !  declaration pour l'appel a phyredem
@@ -187 +190 @@
 !$OMP BARRIER
       co2_ppm=co2_ppm_omp
+      write(*,*)"iniaqua: co2_ppm=",co2_ppm
       solaire=solaire_omp
+      write(*,*)"iniaqua: solaire=",solaire
       alb_ocean=alb_ocean_omp
+      write(*,*)"iniaqua: alb_ocean=",alb_ocean
 
       radsol=0.
@@ -229 +235 @@
 !$OMP BARRIER
       rugos=rugos_omp
+      write(*,*) "iniaqua: rugos=",rugos
       zmasq(:)=pctsrf(:,is_oce)
 
@@ -359 +366 @@
 
       return
-      end
+      end subroutine iniaqua
 
 
@@ -475 +482 @@
 
       RETURN
-      END
+      END subroutine zenang_an
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -486 +493 @@
       use mod_grid_phy_lmdz, only : klon_glo
       use mod_phys_lmdz_transfert_para, only : gather
+      implicit none
 !#include "dimensions.h"
 !#include "dimphy.h"
@@ -504 +512 @@
       real :: phy_glo(klon_glo,360) ! temporary variable, to store phy_***(:)
                                     ! on the whole physics grid 
+      integer :: k
       INTEGER ierr
       INTEGER dimfirst(3)
@@ -564 +573 @@
 c
         ierr = NF_ENDDEF(nid)
+        if (ierr.ne.NF_NOERR) then
+          write(*,*) "writelim error: failed to end define mode"
+          write(*,*) NF_STRERROR(ierr)
+        endif
 c
 
@@ -573 +586 @@
           ierr = NF_PUT_VAR1_REAL (nid,id_tim,k,FLOAT(k))
 #endif
+         if (ierr.ne.NF_NOERR) then
+           write(*,*) "writelim error with temps(k),k=",k
+           write(*,*) NF_STRERROR(ierr)
+         endif
         enddo
 
@@ -701 +718 @@
       endif
 
-      end
+      end subroutine writelim 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -717 +734 @@
 c
       if (klon.ne.nlon) stop'probleme de dimensions dans iniaqua'
+      write(*,*)" profil_sst: type_profil=",type_profil
       do i=1,360
 c      phy_sst(:,i) = 260.+50.*cos(rlatd(:))**2
@@ -887 +905 @@
        amn=MIN(phy_sst(1,1),1000.)
        amx=MAX(phy_sst(1,1),-1000.)
+       imn=1 ; kmn=1 ; imx=1 ; kmx=1
        DO k=1, 360
        DO i=2, nlon
@@ -902 +921 @@
        ENDDO
 c
-       PRINT*,' debut avant writelim min max phy_sst',imn,kmn,amn,
-     & imx,kmx,amx
+       PRINT*,'profil_sst: imn, kmn, phy_sst(imn,kmn) ',imn,kmn,amn
+       PRINT*,'profil_sst: imx, kmx, phy_sst(imx,kmx) ',imx,kmx,amx
 cIM end : verif profil SST: phy_sst
 
        return 
-       end
+       end subroutine profil_sst
+     
+      end module phyaqua_mod

LMDZ5/trunk/libf/phylmd/physiq.F

@@ -45 +45 @@
       use conf_phys_m, only: conf_phys
       use radlwsw_m, only: radlwsw
+      use phyaqua_mod, only: zenang_an
       USE control_mod
 #ifdef REPROBUS