Changeset 2662 for branches

Timestamp:

2011-03-05T10:52:38+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; suppress the need of logical work space (tradmp,wrk_nemo) + bug correction in the size of local 1d arry (tradmp). NB: llwrk_ functions can (should?) now be removed too

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• TRA/tradmp.F90 (modified) (2 diffs)
• wrk_nemo.F90 (modified) (2 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -570 +570 @@
       !!----------------------------------------------------------------------
       USE ioipsl      ! IOipsl librairy
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released, llwrk_in_use, llwrk_not_released
-      USE wrk_nemo, ONLY:   zxc => wrk_1d_1, zyc  => wrk_1d_2, zzc => wrk_1d_3, zdis => wrk_1d_4
-      USE wrk_nemo, ONLY:   llcotu => llwrk_2d_1, llcotv => llwrk_2d_2 , llcotf => llwrk_2d_3
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY:   zxt => wrk_2d_1 , zyt => wrk_2d_2 , zzt => wrk_2d_3, zmask => wrk_2d_4
       !!
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( out ) ::   pdct   ! distance to the coastline
       !!
-      INTEGER ::   ji, jj, jk, jl      ! dummy loop indices
-      INTEGER ::   iju, ijt            ! temporary integers
-      INTEGER ::   icoast, itime
-      INTEGER ::   icot         ! logical unit for file distance to the coast
-
-      CHARACTER (len=32) ::   clname
-      REAL(wp) ::   zdate0
-      !!----------------------------------------------------------------------
-
-      IF( llwrk_in_use(2, 1,2,3) .OR. wrk_in_use(2, 1,2,3,4) .OR.   &
+      INTEGER ::   ji, jj, jk, jl   ! dummy loop indices
+      INTEGER ::   iju, ijt, icoast, itime, ierr, icot   ! local integers
+      CHARACTER (len=32) ::   clname                     ! local name
+      REAL(wp) ::   zdate0                               ! local scalar
+      LOGICAL , ALLOCATABLE, DIMENSION(:,:) ::   llcotu, llcotv, llcotf   ! 2D logical workspace
+      REAL(wp), ALLOCATABLE, DIMENSION(:)   ::   zxc, zyc, zzc, zdis    ! temporary workspace
+      !!----------------------------------------------------------------------
+
+      IF( wrk_in_use(2, 1,2,3,4) .OR.   &
           wrk_in_use(1, 1,2,3,4)  )THEN
-         CALL ctl_stop('cofdis: ERROR: requested workspace arrays unavailable')   ;   RETURN
+         CALL ctl_stop('cofdis: requested workspace arrays unavailable')   ;   RETURN
       END IF
+
+      ALLOCATE( llcotu(jpi,jpj) , llcotv(jpi,jpj) , llcotf(jpi,jpj) ,                        &
+         &      zxc (3*jpi*jpj) , zyc (3*jpi*jpj) , zzc (3*jpi*jpj) , zdis (3*jpi*jpj) , STAT=ierr )
+      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'cofdis: requested local arrays unavailable')
 
       ! 0. Initialization
@@ -741 +743 @@
       CALL restclo( icot )
       !
-      IF( llwrk_not_released(2, 1,2,3)  .OR. &
-           wrk_not_released(2, 1,2,3,4) .OR. & 
-           wrk_not_released(1, 1,2,3,4)  )   CALL ctl_stop('cofdis: failed to release workspace arrays')
+      IF( wrk_not_released(2, 1,2,3,4) .OR. & 
+          wrk_not_released(1, 1,2,3,4)  )   CALL ctl_stop('cofdis: failed to release workspace arrays')
+      DEALLOCATE( llcotu , llcotv , llcotf ,      &
+         &        zxc    , zyc    , zzc    , zdis )
       !
    END SUBROUTINE cofdis

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -77 +77 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:,:), TARGET, PUBLIC ::   wrk_4d_1, wrk_4d_2, wrk_4d_3, wrk_4d_4 
 
-   !                                                               !!**  2D-3D logical workspace  **
-   LOGICAL , ALLOCATABLE, SAVE, DIMENSION(:,:)            , PUBLIC ::   llwrk_2d_1, llwrk_2d_2, llwrk_2d_3 
-   LOGICAL , ALLOCATABLE, SAVE, DIMENSION(:,:,:)  , TARGET, PUBLIC ::   llwrk_3d_1 !: 3D logical workspace
+!!gm   !                                                               !!**  2D-3D logical workspace  **
+!!gm   LOGICAL , ALLOCATABLE, SAVE, DIMENSION(:,:)            , PUBLIC ::   llwrk_2d_1, llwrk_2d_2, llwrk_2d_3 
+!!gm   LOGICAL , ALLOCATABLE, SAVE, DIMENSION(:,:,:)  , TARGET, PUBLIC ::   llwrk_3d_1 !: 3D logical workspace
    
    !                                                               !!** 2D integer workspace  **
@@ -182 +182 @@
       ALLOCATE( wrk_xz_1(jpi,jpk) , wrk_xz_2(jpi,jpk) , wrk_xz_3(jpi,jpk) , wrk_xz_4(jpi,jpk) , STAT=ierror(5) )
          !
-      ALLOCATE( llwrk_2d_1(jpi,jpj) , llwrk_2d_2(jpi,jpj) , llwrk_2d_3(jpi,jpj)               , STAT=ierror(6) )
-         !
-      ALLOCATE( llwrk_3d_1(jpi,jpj,jpk) , STAT=ierror(7) )
+!!gm      ALLOCATE( llwrk_2d_1(jpi,jpj) , llwrk_2d_2(jpi,jpj) , llwrk_2d_3(jpi,jpj)               , STAT=ierror(6) )
+         !
+!!gm      ALLOCATE( llwrk_3d_1(jpi,jpj,jpk) , STAT=ierror(7) )
          !
       ALLOCATE( iwrk_2d_1(jpi,jpj)      , STAT=ierror(8) )