Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

Timestamp:

2011-03-01T20:04:06+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move ctl_stop & warn in lib_mpp to avoid a circular dependency + ctl_stop improvment

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) (8 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -23 +23 @@
    USE zdfddm  , ONLY : avs  !: salinity vertical diffusivity coeff. at w-point
 # endif
-   USE trcnam_trp      ! passive tracers transport namelist variables
+   USE trcnam_trp        ! passive tracers transport namelist variables
    USE trdmod_trc_oce    ! definition of main arrays used for trends computations
    USE in_out_manager    ! I/O manager
@@ -30 +30 @@
    USE ioipsl            ! NetCDF library
    USE lbclnk            ! ocean lateral boundary conditions (or mpp link)
+   USE lib_mpp           ! MPP library
    USE trdmld_trc_rst    ! restart for diagnosing the ML trends
    USE prtctl            ! print control
@@ -47 +48 @@
    CHARACTER (LEN=40) ::  clhstnam                                ! name of the trends NetCDF file
    INTEGER ::   nmoymltrd
-   INTEGER ::   ndextrd1(jpi*jpj)
+   INTEGER, ALLOCATABLE, SAVE, DIMENSION(:) ::   ndextrd1
    INTEGER, DIMENSION(jptra) ::   nidtrd, nh_t
    INTEGER ::   ndimtrd1                        
@@ -87 +88 @@
                ztmltrdbio2(jpi,jpj,jpdiabio)     , &
 #endif
-               Stat=trd_mld_trc_alloc)
-
-      IF(trd_mld_trc_alloc/=0)THEN
-         CALL ctl_warn('trd_mld_trc_alloc : failed to allocate arrays.')
-      END IF
-
+         &     ndextrd1(jpi*jpj)                 ,  STAT=trd_mld_trc_alloc)
+         !
+      IF( lk_mpp                )   CALL mpp_sum ( trd_mld_trc_alloc )
+      IF( trd_mld_trc_alloc /=0 )   CALL ctl_warn('trd_mld_trc_alloc : failed to allocate arrays.')
    END FUNCTION trd_mld_trc_alloc
 
@@ -125 +124 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 1))THEN
-         CALL ctl_stop('trd_mld_trc_zint : requested workspace array unavailable.')
-         RETURN
+      IF( wrk_in_use(2, 1) ) THEN
+         CALL ctl_stop('trd_mld_trc_zint : requested workspace array unavailable')   ;   RETURN
       END IF
 
@@ -213 +211 @@
       END SELECT
 
-      IF(wrk_not_released(2, 1))THEN
-         CALL ctl_stop('trd_mld_trc_zint : failed to release workspace array.')
-      END IF
-
+      IF( wrk_not_released(2, 1) )   CALL ctl_stop('trd_mld_trc_zint : failed to release workspace array.')
+      !
     END SUBROUTINE trd_mld_trc_zint
-    
+
+
     SUBROUTINE trd_mld_bio_zint( ptrc_trdmld, ktrd )
       !!----------------------------------------------------------------------
@@ -387 +384 @@
       !!       - See NEMO documentation (in preparation)
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, wrk_3d_1, wrk_3d_2, wrk_3d_3, wrk_3d_4, &
-                    wrk_3d_5, wrk_3d_6, wrk_3d_7, wrk_3d_8, &
-                    wrk_3d_9
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   wrk_3d_1, wrk_3d_2, wrk_3d_3, wrk_3d_4
+      USE wrk_nemo, ONLY:   wrk_3d_5, wrk_3d_6, wrk_3d_7, wrk_3d_8, wrk_3d_9
+      !
       INTEGER, INTENT( in ) ::   kt                               ! ocean time-step index
       INTEGER ::   ji, jj, jk, jl, ik, it, itmod, jn
@@ -414 +411 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(3, 1,2,3,4,5,6,7,8,9))THEN
-         CALL ctl_stop('trd_mld_trc : requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(3, 1,2,3,4,5,6,7,8,9) ) THEN
+         CALL ctl_stop('trd_mld_trc : requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
       ! Set-up pointers into sub-arrays of workspaces
       ztmltot   => wrk_3d_1(:,:,1:jptra)