Changeset 735 for LMDZ4/branches/V3_test/libf/phylmd/phyredem.F

Timestamp:

Nov 10, 2006, 3:50:16 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Modifications version parallele
YM/LF

File:

• LMDZ4/branches/V3_test/libf/phylmd/phyredem.F (modified) (13 diffs)

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

@@ -95 +95 @@
       real clwcon(klon2,klev),rnebcon(klon2,klev),ratqs(klon2,klev)
       REAL run_off_lic_0(klon2)
+      REAL masq(klon2)
 c
       INTEGER nid, nvarid, idim1, idim2, idim3
@@ -138 +139 @@
       REAL,SAVE,ALLOCATABLE :: ratqs_mpi(:,:)
       REAL,SAVE,ALLOCATABLE :: run_off_lic_0_mpi(:)
+      REAL,SAVE,ALLOCATABLE :: masq_mpi(:)
       
 c$OMP MASTER
@@ -173 +175 @@
       ALLOCATE( ratqs_mpi(klon_mpi,klev))
       ALLOCATE( run_off_lic_0_mpi(klon_mpi))
+      ALLOCATE( masq_mpi(klon_mpi))
 c$OMP END MASTER
 c$OMP BARRIER      
@@ -211 +214 @@
       call GatherField_omp( clwcon_p,clwcon_mpi,klev)
       call GatherField_omp( ratqs_p,ratqs_mpi,klev)
-      
+      call GatherField_omp( zmasq,masq_mpi,1)
+
 c$OMP MASTER      
       call GatherField( rlat_mpi,rlat,1)
@@ -248 +252 @@
       call GatherField( clwcon_mpi,clwcon,klev)
       call GatherField( ratqs_mpi,ratqs,klev)
-
+      call GatherField( masq_mpi,masq,1)
+      
       DEALLOCATE( rlat_mpi, rlon_mpi)
       DEALLOCATE( tsol_mpi)
@@ -282 +287 @@
       DEALLOCATE( ratqs_mpi)
       DEALLOCATE( run_off_lic_0_mpi)
+      DEALLOCATE( masq_mpi)
 
       if (phy_rank==0) then
@@ -296 +302 @@
 c
       ierr = NF_DEF_DIM (nid, "index", length, idim1)
-      ierr = NF_DEF_DIM (nid, "points_physiques", klon, idim2)
-      ierr = NF_DEF_DIM (nid, "horizon_vertical", klon*klev, idim3)
+      ierr = NF_DEF_DIM (nid, "points_physiques", klon2, idim2)
+      ierr = NF_DEF_DIM (nid, "horizon_vertical", klon2*klev, idim3)
 c
       ierr = NF_ENDDEF(nid)
@@ -378 +384 @@
       ierr = NF_ENDDEF(nid)
 #ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,zmasq)
-#else
-      ierr = NF_PUT_VAR_REAL (nid,nvarid,zmasq)
+      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,masq)
+#else
+      ierr = NF_PUT_VAR_REAL (nid,nvarid,masq)
 #endif      
 c BP ajout des fraction de chaque sous-surface
@@ -396 +402 @@
       ierr = NF_ENDDEF(nid)
 #ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon, is_ter))
-#else
-      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon, is_ter))
+      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon2, is_ter))
+#else
+      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon2, is_ter))
 #endif
 C 
@@ -413 +419 @@
       ierr = NF_ENDDEF(nid)
 #ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon,is_lic))
-#else
-      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon, is_lic))
+      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon2,is_lic))
+#else
+      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon2, is_lic))
 #endif
 C
@@ -430 +436 @@
       ierr = NF_ENDDEF(nid)
 #ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon, is_oce))
-#else
-      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon, is_oce))
+      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon2, is_oce))
+#else
+      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon2, is_oce))
 #endif
 C
@@ -447 +453 @@
       ierr = NF_ENDDEF(nid)
 #ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon, is_sic))
-#else
-      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon, is_sic))
+      ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,pctsrf(1 : klon2, is_sic))
+#else
+      ierr = NF_PUT_VAR_REAL (nid,nvarid,pctsrf(1 : klon2, is_sic))
 #endif
 C
@@ -757 +763 @@
 #endif
 c
+       endif
+c$OMP END MASTER
+cc ----> necessaire pour eviter bug openMP sur SX6
+c$OMP MASTER
+      if (phy_rank==0) then
       DO nsrf = 1, nbsrf
         IF (nsrf.LE.99) THEN