Changeset 776 for LMDZ4/trunk/libf/phylmd/condsurf.F

Timestamp:

Jun 7, 2007, 12:01:52 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Suite du merge entre la version et la HEAD: quelques modifications
de Yann sur le
LF

File:

• LMDZ4/trunk/libf/phylmd/condsurf.F (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/condsurf.F

@@ -3 +3 @@
       SUBROUTINE condsurf( jour, jourvrai, lmt_bils )
       USE dimphy
+      USE mod_grid_phy_lmdz
+      USE mod_phys_lmdz_para
       IMPLICIT none
 c
@@ -39 +41 @@
       CHARACTER*20 fich
       
-      REAL :: lmt_bils_glo(klon2)
-      REAL,ALLOCATABLE,SAVE :: lmt_bils_mpi(:)
+      REAL :: lmt_bils_glo(klon_glo)
       
-      LOGICAL,SAVE :: first
-c$OMP THREADPRIVATE(first)
 cc
 cc   .....................................................................
@@ -53 +52 @@
 c
 c
-      IF (first) THEN
-        ALLOCATE(lmt_bils_mpi(klon_mpi))
-      ENDIF
       
       IF (jour.LT.0 .OR. jour.GT.(360-1)) THEN
@@ -92 +88 @@
 c
 c$OMP MASTER
-      IF (phy_rank==0) THEN
+      IF (is_mpi_root) THEN
       ierr = NF_OPEN (fich, NF_NOWRITE,nid)
       IF (ierr.NE.NF_NOERR) THEN
@@ -106 +102 @@
       debut(1) = 1
       debut(2) = jourvrai
-      epais(1) = klon2
+      epais(1) = klon_glo
       epais(2) = 1
-c
 c Bilan flux de chaleur au sol:
 c
@@ -132 +127 @@
       ierr = NF_CLOSE(nid)
       
-      ENDIF ! phyrank==0
+      ENDIF ! is_mpi_root==0
 
-      CALL scatterField(lmt_bils_glo,lmt_bils_mpi,1)
 c$OMP END MASTER
-c$OMP BARRIER
-      CALL scatterField_omp(lmt_bils_mpi,lmt_bils,1)
+      CALL scatter(lmt_bils_glo,lmt_bils)
             
 c