Changeset 3200

Timestamp:

2011-12-07T16:00:49+01:00 (12 years ago)

Author:

cbricaud

Message:

bugs corections for compilation witk key_dimgout

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO

Files:

• LIM_SRC_2/limwri_2.F90 (modified) (2 diffs)
• LIM_SRC_2/limwri_dimg_2.h90 (modified) (2 diffs)
• OPA_SRC/DIA/diadimg.F90 (modified) (1 diff)
• OPA_SRC/DIA/diawri_dimg.h90 (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90

@@ -208 +208 @@
    END SUBROUTINE lim_wri_2
      
+# endif
 
    SUBROUTINE lim_wri_init_2
@@ -294 +295 @@
    END SUBROUTINE lim_wri_init_2
 
-# endif
 #endif
 

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90

@@ -22 +22 @@
     INTEGER , SAVE, DIMENSION(:), ALLOCATABLE  :: nsubindex   !: subindex to be saved
     INTEGER , SAVE ::   nice, nhorid, ndim, niter, ndepid
-    REAL(wp), SAVE, DIMENSION(jpi,jpj,jpnoumax) :: rcmoy
+    REAL(wp), SAVE, DIMENSION(:,:,:), ALLOCATABLE :: rcmoy
 
     INTEGER ::  ji, jj, jf, ii   ! dummy loop indices and array index
     INTEGER :: iyear, iday, imon ! 
+    INTEGER :: ialloc
     CHARACTER(LEN=80) :: clname, cltext, clmode
     REAL(wp), DIMENSION(1) ::   zdept
@@ -39 +40 @@
 #endif
     !!-------------------------------------------------------------------
+    IF( .NOT. ALLOCATED(rcmoy) )THEN
+        ALLOCATE(rcmoy(jpi,jpj,jpnoumax),  STAT=ialloc )
+       !
+       IF( lk_mpp      )   CALL mpp_sum ( ialloc  )
+       IF( ialloc /= 0 )   CALL ctl_warn('lim_wri_2 (limwri_dimg_2.h90) : failed to allocate arrays')
+    ENDIF
 
     IF( kt == nit000 ) THEN 

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90

@@ -10 +10 @@
    USE in_out_manager  ! I/O manager
    USE daymod          ! calendar
+   USE lib_mpp
 
    IMPLICIT NONE

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -82 +82 @@
     INTEGER :: inbsel, jk
     INTEGER :: iyear,imon,iday
+    INTEGER :: ialloc
     REAL(wp) :: zdtj
     CHARACTER(LEN=80) :: clname
@@ -93 +94 @@
     !  ---------------
     !
-    IF(.not.ALLOCATED(um))THEN
+    IF( .NOT. ALLOCATED(um) )THEN
        ALLOCATE(um(jpi,jpj,jpk), vm(jpi,jpj,jpk), &
                 wm(jpi,jpj,jpk),                  &
@@ -99 +100 @@
                 tm(jpi,jpj,jpk), sm(jpi,jpj,jpk), &
                 fsel(jpi,jpj,jpk),                &
-                Stat=jk)
-       IF(jk /= 0)THEN
-          WRITE(*,*) 'ERROR: allocate failed in dia_wri (diawri_dimg.h90)'
-          CALL mppabort()
-       END IF
-    END IF
+                STAT=ialloc )
+       !
+       IF( lk_mpp      )   CALL mpp_sum ( ialloc  )
+       IF( ialloc /= 0 )   CALL ctl_warn('dia_wri( diawri_dimg.h90) : failed to allocate arrays')
+    ENDIF
+
 
     inbsel = 17