Changeset 704 for LMDZ4/branches/V3_test/libf/phylmd/orografi.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/orografi.F (modified) (18 diffs)

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

@@ -9 +9 @@
      s                   d_t, d_u, d_v)
 c
+      USE dimphy
       IMPLICIT none
 c======================================================================
@@ -26 +27 @@
 c d_v-----output-R-increment de la vitesse v
 c======================================================================
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 c
@@ -132 +133 @@
      r                 , pvom,pvol,pte )
 
+      USE dimphy
       implicit none
 
@@ -181 +183 @@
 c
 c
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 #include "YOEGWD.h"
@@ -191 +193 @@
 c
 c
-      integer nlon, nlev, klevm1
+cym      integer nlon, nlev, klevm1
+      integer nlon, nlev
       integer kgwd, jl, ilevp1, jk, ji
       real zdelp, ztemp, zforc, ztend
@@ -259 +262 @@
 c     ztmst=twodt
 c     if(nstep.eq.nstart) ztmst=0.5*twodt
-      klevm1=klev-1
+cym      klevm1=klev-1
       ztmst=ptsphy
       zrtmst=1./ztmst
@@ -466 +469 @@
 c
 c-----------------------------------------------------------------------
+      USE dimphy
       implicit none
 c
 
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 #include "YOEGWD.h"
@@ -934 +938 @@
 c
 c-----------------------------------------------------------------------
+      USE dimphy
       implicit none
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 #include "YOEGWD.h"
@@ -1068 +1073 @@
 C     PASSAGE OF THE NEW GWDRAG TO I.F.S. (F. LOTT, 22/11/93)
 C-----------------------------------------------------------------------
+      USE dimphy
       implicit none
 C
@@ -1073 +1079 @@
 C
 
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 #include "YOEGWD.h"
@@ -1299 +1305 @@
      s                   d_t, d_u, d_v)
 c
+      USE dimphy
       IMPLICIT none
 c======================================================================
@@ -1316 +1323 @@
 c d_v-----output-R-increment de la vitesse v
 c======================================================================
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 c
@@ -1439 +1446 @@
 C     F.LOTT  LMD 22/11/95
 C
+      USE dimphy
       implicit none
 C
 C
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 #include "YOMCST.h"
 #include "YOEGWD.h"
@@ -1473 +1481 @@
 C*       0.2   LOCAL ARRAYS
 C              ------------
-      logical lifthigh
-      integer klevm1, jl, ilevh, jk
+      logical lifthigh, ll1
+cym      integer klevm1, jl, ilevh, jk
+      integer  jl, ilevh, jk
       real zcons1, ztmst, zrtmst,zpi, zhgeo
       real zdelp, zslow, zsqua, zscav, zbet
@@ -1497 +1506 @@
       IF(NLON.NE.KLON.OR.NLEV.NE.KLEV)STOP
       ZCONS1=1./RD
-      KLEVM1=KLEV-1
+cym      KLEVM1=KLEV-1
       ZTMST=PTSPHY
       ZRTMST=1./ZTMST
@@ -1698 +1707 @@
       RETURN
       END
+
+
       SUBROUTINE SUGWD(NLON,NLEV,paprs,pplay)
+      USE dimphy
+c      USE parallel
 C
 C**** *SUGWD* INITIALIZE COMMON YOEGWD CONTROLLING GRAVITY WAVE DRAG
@@ -1751 +1764 @@
       REAL pplay(nlon,nlev)
       real zpr,zstra,zsigt,zpm1r
+      REAL,SAVE,ALLOCATABLE :: pplay_mpi(:,:)
+      REAL,SAVE,ALLOCATABLE :: paprs_mpi(:,:)
+      REAL,SAVE,ALLOCATABLE :: pplay_glo(:,:)
+      REAL,SAVE,ALLOCATABLE :: paprs_glo(:,:)
+
 C
 C*       1.    SET THE VALUES OF THE PARAMETERS
@@ -1766 +1784 @@
 cold  ZSIGT=0.85
 C
+c$OMP MASTER
+      ALLOCATE(pplay_mpi(klon_mpi,nlev))
+      ALLOCATE(paprs_mpi(klon_mpi,nlev+1))
+      ALLOCATE(pplay_glo(klon2,nlev))
+      ALLOCATE(paprs_glo(klon2,nlev+1))
+c$OMP END MASTER
+c$OMP BARRIER
+
+      CALL GatherField_omp(pplay,pplay_mpi,nlev)      
+      CALL GatherField_omp(paprs,paprs_mpi,nlev+1)
+
+c$OMP MASTER      
+      CALL  AllGatherField(pplay_mpi,pplay_glo,nlev)
+      CALL  AllGatherField(paprs_mpi,paprs_glo,nlev+1)
+c$OMP END MASTER
+c$OMP BARRIER
+      
       DO 110 JK=1,NLEV
-      ZPM1R=pplay(nlon/2,jk)/paprs(nlon/2,1) 
+      ZPM1R=pplay_glo(klon2/2,jk)/paprs_glo(klon2/2,1) 
       IF(ZPM1R.GE.ZSIGT)THEN
          nktopg=JK
       ENDIF
-      ZPM1R=pplay(nlon/2,jk)/paprs(nlon/2,1) 
+      ZPM1R=pplay_glo(klon2/2,jk)/paprs_glo(klon2/2,1) 
       IF(ZPM1R.GE.ZSTRA)THEN
          NSTRA=JK
       ENDIF
   110 CONTINUE
+
+c$OMP BARRIER
+c$OMP MASTER
+      DEALLOCATE(pplay_mpi)
+      DEALLOCATE(paprs_mpi)
+      DEALLOCATE(pplay_glo)
+      DEALLOCATE(paprs_glo)
+c$OMP END MASTER
+c$OMP BARRIER
+
 c
 c  inversion car dans orodrag on compte les niveaux a l'envers