Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/phyaqua.F

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phyaqua.F (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/phyaqua.F

@@ -16 +16 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      use comgeomphy, only : rlatd,rlond
-      use dimphy, only : klon
-      use surface_data, only : type_ocean,ok_veget
-      use pbl_surface_mod, only : pbl_surface_init
+      USE comgeomphy, only : rlatd,rlond
+      USE dimphy, only : klon
+      USE surface_data, only : type_ocean,ok_veget
+      USE pbl_surface_mod, only : pbl_surface_init
       USE fonte_neige_mod, only : fonte_neige_init
-      use phys_state_var_mod
-      use control_mod, only : dayref,nday,iphysiq
+      USE phys_state_var_mod
+      USE control_mod, only : dayref,nday,iphysiq
+      USE indice_sol_mod
 
       USE IOIPSL 
@@ -33 +34 @@
 #include "clesphys.h"
 #include "dimsoil.h"
-#include "indicesol.h"
 #include "temps.h"
 
@@ -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)