Changeset 9652 for NEMO/trunk/tests/CANAL

Timestamp:

2018-05-28T09:13:39+02:00 (6 years ago)

Author:

smasson

Message:

trunk: dia_wri_alloc allocate nothing when using key_iomput, see ticket:2090

File:

• NEMO/trunk/tests/CANAL/MY_SRC/diawri.F90 (modified) (2 diffs)

NEMO/trunk/tests/CANAL/MY_SRC/diawri.F90

@@ -85 +85 @@
 CONTAINS
 
-   INTEGER FUNCTION dia_wri_alloc()
-      !!----------------------------------------------------------------------
-      INTEGER, DIMENSION(2) :: ierr
-      !!----------------------------------------------------------------------
-      ierr = 0
-      ALLOCATE( ndex_hT(jpi*jpj) , ndex_T(jpi*jpj*jpk) ,     &
-         &      ndex_hU(jpi*jpj) , ndex_U(jpi*jpj*jpk) ,     &
-         &      ndex_hV(jpi*jpj) , ndex_V(jpi*jpj*jpk) , STAT=ierr(1) )
-         !
-      dia_wri_alloc = MAXVAL(ierr)
-      IF( lk_mpp )   CALL mpp_sum( dia_wri_alloc )
-      !
-  END FUNCTION dia_wri_alloc
-
-   !!----------------------------------------------------------------------
-   !!   Default option                                   NetCDF output file
-   !!----------------------------------------------------------------------
 #if defined key_iomput
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                        use IOM library
    !!----------------------------------------------------------------------
+
+   INTEGER FUNCTION dia_wri_alloc()
+      !
+      dia_wri_alloc = 0
+      !
+   END FUNCTION dia_wri_alloc
+
 
    SUBROUTINE dia_wri( kt )
@@ -515 +505 @@
    !!   Default option                                  use IOIPSL  library
    !!----------------------------------------------------------------------
-
+   
+   INTEGER FUNCTION dia_wri_alloc()
+      !!----------------------------------------------------------------------
+      INTEGER, DIMENSION(2) :: ierr
+      !!----------------------------------------------------------------------
+      ierr = 0
+      ALLOCATE( ndex_hT(jpi*jpj) , ndex_T(jpi*jpj*jpk) ,     &
+         &      ndex_hU(jpi*jpj) , ndex_U(jpi*jpj*jpk) ,     &
+         &      ndex_hV(jpi*jpj) , ndex_V(jpi*jpj*jpk) , STAT=ierr(1) )
+         !
+      dia_wri_alloc = MAXVAL(ierr)
+      IF( lk_mpp )   CALL mpp_sum( dia_wri_alloc )
+      !
+   END FUNCTION dia_wri_alloc
+  
+  
    SUBROUTINE dia_wri( kt )
       !!---------------------------------------------------------------------