Changeset 2514 for LMDZ5

Timestamp:

May 13, 2016, 8:46:39 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Some bug fixes in slab model to run in parallel.
FC

File:

• LMDZ5/trunk/libf/phylmd/limit_slab.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/phylmd/limit_slab.F90

@@ -42 +42 @@
   lmt_pas = NINT(86400./dtime)
   
+! Initialize saved variables
+     IF (.NOT. ALLOCATED(bils_save)) THEN
+        ALLOCATE(bils_save(klon), diff_sst_save(klon), diff_siv_save(klon), stat=ierr)
+        IF (ierr /= 0) CALL abort_physic('limit_slab', 'pb in allocation',1)
+     END IF
+
   ! F. Codron 5/14: add defaults for bils, diff_sst (0)
   IF (MOD(itime-1, lmt_pas) == 0) THEN   ! time to read
-     !$OMP MASTER  ! Only master thread
+!$OMP MASTER  ! Only master thread
      IF (is_mpi_root) THEN ! Only master processus
         print*,'in limit_slab time to read, itime=',itime
@@ -53 +59 @@
         ierr = NF90_OPEN ('limit_slab.nc', NF90_NOWRITE, nid)
         IF (ierr /= NF90_NOERR) THEN
+            PRINT *,'LIMIT_SLAB file not found'
             read_bils=.FALSE.
             read_sst=.FALSE.
@@ -112 +119 @@
         ierr = NF90_CLOSE(nid)
         IF (ierr /= NF90_NOERR) CALL abort_physic(modname,'Pb when closing file', 1)
-        END IF ! Read File
+        END IF ! Read File 
         IF (read_sst) THEN
 ! Calculate difference in temperature between this day and one ahead
@@ -128 +135 @@
 
 !$OMP END MASTER
+!$OMP BARRIER
        
-     IF (.NOT. ALLOCATED(bils_save)) THEN
-        ALLOCATE(bils_save(klon), diff_sst_save(klon), diff_siv_save(klon), stat=ierr)
-        IF (ierr /= 0) CALL abort_physic('limit_slab', 'pb in allocation',1)
-     END IF
-
+! Send fields to all processes
 ! Give default values if needed
+     CALL bcast(read_bils)
+     CALL bcast(read_sst)
+     CALL bcast(read_siv)
+     PRINT *,'limit_slab sst',read_sst,'siv',read_siv,'qflux',read_bils
      IF (read_bils) THEN
          CALL Scatter(bils_glo, bils_save)
@@ -156 +164 @@
   diff_sst(:) = diff_sst_save(:)
   diff_siv(:) = diff_siv_save(:)
+! For Debug purpose
+!  PRINT *,'limit_slab sst',MINVAL(diff_sst(:)),MAXVAL(diff_sst(:))
+!  PRINT *,'limit_slab siv',MINVAL(diff_siv(:)),MAXVAL(diff_siv(:))
+!  PRINT *,'limit_slab bils',MINVAL(lmt_bils(:)),MAXVAL(lmt_bils(:))
 
-  
 END SUBROUTINE limit_slab