Changeset 1759 for LMDZ5/trunk/libf/phylmd/phyaqua.F

Timestamp:

May 24, 2013, 11:52:12 AM (12 years ago)

Author:

Ehouarn Millour

Message:

IOIPSL routine getin is not threadsafe, so when running in OpenMP, it should be called by only one thread (and the result copied to other threads in the case of threadprivate variables).
EM

File:

• LMDZ5/trunk/libf/phylmd/phyaqua.F (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/phyaqua.F

@@ -89 +89 @@
       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
 !-------------------------------------------------------------------------
 !  declaration pour l'appel a phyredem
@@ -160 +164 @@
          zcufi=1.
          zcvfi=1.
-      nbapp_rad=24
-      CALL getin('nbapp_rad',nbapp_rad)
+!$OMP MASTER
+      nbapp_rad_omp=24
+      CALL getin('nbapp_rad',nbapp_rad_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+      nbapp_rad=nbapp_rad_omp
 
 !---------------------------------------------------------------------
@@ -168 +176 @@
 ! Initialisations des constantes
 ! Ajouter les manquants dans planete.def... (albedo etc)
-      co2_ppm=348.
-      CALL getin('co2_ppm',co2_ppm)
-      solaire=1365.
-      CALL getin('solaire',solaire)
+!$OMP MASTER
+      co2_ppm_omp=348.
+      CALL getin('co2_ppm',co2_ppm_omp)
+      solaire_omp=1365.
+      CALL getin('solaire',solaire_omp)
+!      CALL getin('albedo',albedo) ! albedo is set below, depending on type_aqua
+      alb_ocean_omp=.true.
+      CALL getin('alb_ocean',alb_ocean_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+      co2_ppm=co2_ppm_omp
+      solaire=solaire_omp
+      alb_ocean=alb_ocean_omp
+
       radsol=0.
       qsol_f=10.
-!      CALL getin('albedo',albedo) ! albedo is set below, depending on type_aqua
-      alb_ocean=.true.
-      CALL getin('alb_ocean',alb_ocean)
 
 c  Conditions aux limites:
@@ -208 +223 @@
       endif
 
-      CALL getin('rugos',rugos)
+!$OMP MASTER
+      rugos_omp=rugos
+      CALL getin('rugos',rugos_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+      rugos=rugos_omp
       zmasq(:)=pctsrf(:,is_oce)