Changeset 704 for LMDZ4/branches/V3_test/libf/phylmd/soil.F

Timestamp:

Aug 17, 2006, 5:41:51 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Inclusion des modifs de Y. Meurdesoif pour la version V3
LF

File:

• LMDZ4/branches/V3_test/libf/phylmd/soil.F (modified) (10 diffs)

LMDZ4/branches/V3_test/libf/phylmd/soil.F

@@ -4 +4 @@
       SUBROUTINE soil(ptimestep, indice, knon, snow, ptsrf, ptsoil,
      s          pcapcal, pfluxgrd)
+      use dimphy
       IMPLICIT NONE
 
@@ -49 +50 @@
 c   -------------
 
-#include "dimensions.h"
+cym#include "dimensions.h"
 #include "YOMCST.h"
-#include "dimphy.h"
+cym#include "dimphy.h"
 #include "dimsoil.h"
 #include "indicesol.h"
@@ -69 +70 @@
 
       INTEGER ig,jk
-c$$$      REAL zdz2(nsoilmx),z1(klon)
+c@$$      REAL zdz2(nsoilmx),z1(klon)
       REAL zdz2(nsoilmx),z1(klon,nbsrf)
-      REAL min_period,dalph_soil
+      REAL,SAVE :: min_period,dalph_soil
       REAL ztherm_i(klon)
 
@@ -77 +78 @@
 c   ----------------------
       REAL dz1(nsoilmx),dz2(nsoilmx)
-c$$$          REAL zc(klon,nsoilmx),zd(klon,nsoilmx)
-      REAL zc(klon,nsoilmx,nbsrf),zd(klon,nsoilmx,nbsrf)
+c@$$          REAL zc(klon,nsoilmx),zd(klon,nsoilmx)
+cym      REAL zc(klon,nsoilmx,nbsrf),zd(klon,nsoilmx,nbsrf)
+      REAL,ALLOCATABLE,SAVE ::  zc(:,:,:),zd(:,:,:)
+c$OMP THREADPRIVATE(zc,zd)
       REAL lambda
-      SAVE dz1,dz2,zc,zd,lambda
+cym      SAVE dz1,dz2,zc,zd,lambda
+      SAVE dz1,dz2,lambda
+c$OMP THREADPRIVATE(dz1,dz2,lambda)
       LOGICAL firstcall, firstsurf(nbsrf)
       SAVE firstcall, firstsurf
+c$OMP THREADPRIVATE(firstcall, firstsurf)
       REAL isol,isno,iice
       SAVE isol,isno,iice
-
+c$OMP THREADPRIVATE(isol,isno,iice)
       DATA firstcall/.true./
       DATA firstsurf/.TRUE.,.TRUE.,.TRUE.,.TRUE./
 
       DATA isol,isno,iice/2000.,2000.,2000./
-
+      LOGICAL,SAVE :: First=.true.
+c$OMP THREADPRIVATE(First)
 c-----------------------------------------------------------------------
 c   Depthts:
@@ -103 +110 @@
 c   on corrige si on a un point de terre avec ou sans glace
 c
+      IF (first) THEN
+        allocate(zc(klon,nsoilmx,nbsrf),zd(klon,nsoilmx,nbsrf))
+        first=.false.
+      ENDIF
+      
       IF (indice.EQ.is_sic) THEN
          DO ig = 1, knon
@@ -128 +140 @@
 
 
-c$$$      IF (firstcall) THEN
+c@$$      IF (firstcall) THEN
       IF (firstsurf(indice)) THEN 
 
@@ -138 +150 @@
          min_period=1800. ! en secondes
          dalph_soil=2.    ! rapport entre les epaisseurs de 2 couches succ.
-
+c$OMP MASTER
          OPEN(99,file='soil.def',status='old',form='formatted',err=9999)
          READ(99,*) min_period
@@ -147 +159 @@
          CLOSE(99)
 9999     CONTINUE
+c$OMP END MASTER
+c$OMP BARRIER
 
 c   la premiere couche represente un dixieme de cycle diurne
@@ -172 +186 @@
 C PB
          firstsurf(indice) = .FALSE. 
-c$$$         firstcall =.false.
+c@$$         firstcall =.false.
 
 c   Initialisations:
@@ -202 +216 @@
 c   ---------------------------------------------------------------
 
-c$$$  PB ajout pour cas glace de mer
+c@$$  PB ajout pour cas glace de mer
       IF (indice .EQ. is_sic) THEN
           DO ig = 1 , knon