Changeset 2625 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DIA

Timestamp:

2011-02-27T17:36:24+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; OPA_SRC mpp compilation: suppression of the USE in_out_manager in lib_mpp + style in DYN

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• diaptr.F90 (modified) (3 diffs)
• diawri.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -97 +97 @@
       INTEGER, DIMENSION(5) ::   ierr
       !!----------------------------------------------------------------------
-
       ierr(:) = 0
-
+      !
       ALLOCATE( btmsk(jpi,jpj,nptr) ,           &
-         &       htr_adv(jpj) , str_adv(jpj) ,   &
-         &       htr_ldf(jpj) , str_ldf(jpj) ,   &
-         &       htr_ove(jpj) , str_ove(jpj),    &
-         &       htr(jpj,nptr) , str(jpj,nptr) , &
-         &       tn_jk(jpj,jpk,nptr) , sn_jk (jpj,jpk,nptr) , v_msf(jpj,jpk,nptr) , &
-         &       sjk  (jpj,jpk,nptr) , r1_sjk(jpj,jpk,nptr) , STAT=ierr(1)  )
+         &      htr_adv(jpj) , str_adv(jpj) ,   &
+         &      htr_ldf(jpj) , str_ldf(jpj) ,   &
+         &      htr_ove(jpj) , str_ove(jpj),    &
+         &      htr(jpj,nptr) , str(jpj,nptr) , &
+         &      tn_jk(jpj,jpk,nptr) , sn_jk (jpj,jpk,nptr) , v_msf(jpj,jpk,nptr) , &
+         &      sjk  (jpj,jpk,nptr) , r1_sjk(jpj,jpk,nptr) , STAT=ierr(1)  )
          !
 #if defined key_diaeiv
@@ -112 +111 @@
          &      v_msf_eiv(jpj,jpk,nptr) , STAT=ierr(2) )
 #endif
-
       ALLOCATE( p_fval1d(jpj), p_fval2d(jpj,jpk), Stat=ierr(3))
-
+      !
       ALLOCATE(ndex(jpj*jpk),        ndex_atl(jpj*jpk), ndex_pac(jpj*jpk), &
          &     ndex_ind(jpj*jpk),    ndex_ipc(jpj*jpk),                    &
@@ -482 +480 @@
       ENDIF
       
-      IF( lk_mpp )   CALL mpp_ini_znl     ! Define MPI communicator for zonal sum
+      IF( lk_mpp )   CALL mpp_ini_znl( numout )     ! Define MPI communicator for zonal sum
 
       IF( ln_subbas ) THEN                ! load sub-basin mask

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -48 +48 @@
    USE dtatem
    USE dtasal
+   USE lib_mpp         ! MPP library
 
    IMPLICIT NONE
@@ -75 +76 @@
 CONTAINS
 
-   FUNCTION dia_wri_alloc()
+   INTEGER FUNCTION dia_wri_alloc()
       !!----------------------------------------------------------------------
-      IMPLICIT none
-      INTEGER :: dia_wri_alloc
       INTEGER, DIMENSION(2) :: ierr
       !!----------------------------------------------------------------------
@@ -89 +88 @@
          !
       dia_wri_alloc = MAXVAL(ierr)
-      IF( lk_mpp )   CALL mpp_sum( ierr )
+      IF( lk_mpp )   CALL mpp_sum( dia_wri_alloc )
       !
   END FUNCTION dia_wri_alloc