Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

@@ -27 +27 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY :   aht0
-      USE wrk_nemo  , ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo  , ONLY:   zcoef => wrk_1d_2
       !!
       LOGICAL, INTENT (in) ::   ld_print   ! If true, output arrays on numout
@@ -37 +35 @@
       REAL(wp) ::   zd_max       ! maximum grid spacing over the global domain
       REAL(wp) ::   za00, zc, zd, zetmax, zefmax, zeumax, zevmax   ! local scalars
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(1,2) ) THEN
-         CALL ctl_stop('ldf_dyn_c3d: requested workspace array unavailable')   ;   RETURN
-      ENDIF
-
+      REAL(wp), POINTER, DIMENSION(:) :: zcoef   
+      !!----------------------------------------------------------------------
+      !
+      CALL wrk_alloc( jpk, zcoef )
+      !
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'ldf_dyn_c3d : 3D lateral eddy viscosity coefficient'
@@ -182 +179 @@
       ENDIF
       !
-      IF( wrk_not_released(1,2) )   CALL ctl_stop('ldf_dyn_c3d: failed to release workspace array')
+      CALL wrk_dealloc( jpk, zcoef )
       !
    END SUBROUTINE ldf_dyn_c3d
@@ -196 +193 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY:   aht0
-      USE wrk_nemo  , ONLY:   wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
-      USE wrk_nemo  , ONLY:   icof  => iwrk_2d_1
-      USE wrk_nemo  , ONLY:   zahm0 =>  wrk_2d_1
-      USE wrk_nemo  , ONLY:   zcoef =>  wrk_1d_1
       !!
       LOGICAL, INTENT(in) ::   ld_print   ! If true, output arrays on numout
@@ -207 +200 @@
       INTEGER ::   inum, iim, ijm      ! 
       INTEGER ::   ifreq, il1, il2, ij, ii
-      INTEGER, DIMENSION(jpidta, jpjdta) ::   idata
-
       REAL(wp) ::   zahmeq, zcoff, zcoft, zmsk   ! local scalars
       REAL(wp) ::   zemax , zemin, zeref, zahmm
       CHARACTER (len=15) ::   clexp
-      !!----------------------------------------------------------------------
-
-      IF( iwrk_in_use(2,1) .OR. wrk_in_use(2,1) .OR. wrk_in_use(1,1) ) THEN
-         CALL ctl_stop('ldf_dyn_c3d_orca: requested workspace arrays are unavailable')   ;   RETURN
-      ENDIF
-
+      INTEGER , POINTER, DIMENSION(:,:)  :: icof
+      INTEGER , POINTER, DIMENSION(:,:)  :: idata
+      REAL(wp), POINTER, DIMENSION(:  )  :: zcoef   
+      REAL(wp), POINTER, DIMENSION(:,:)  :: zahm0
+      !!----------------------------------------------------------------------
+      !
+      CALL wrk_alloc( jpi   , jpj   , icof  )
+      CALL wrk_alloc( jpidta, jpjdta, idata )
+      CALL wrk_alloc( jpk   ,         zcoef )
+      CALL wrk_alloc( jpi   , jpj   , zahm0 )
+      !
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'ldfdyn_c3d_orca : 3D eddy viscosity coefficient'
@@ -457 +453 @@
          CALL prihre(ahm4(:,:,1),jpi,jpj,1,jpi,1,1,jpj,1,1.e-3,numout)
       ENDIF
-
-      IF( iwrk_not_released(2,1) .OR.   &
-           wrk_not_released(2,1) .OR.   &
-           wrk_not_released(1,1)   ) CALL ctl_stop('ldf_dyn_c3d_orca: failed to release workspace arrays')
+      !
+      CALL wrk_dealloc( jpi   , jpj   , icof  )
+      CALL wrk_dealloc( jpidta, jpjdta, idata )
+      CALL wrk_dealloc( jpk   ,         zcoef )
+      CALL wrk_dealloc( jpi   , jpj   , zahm0 )
       !
    END SUBROUTINE ldf_dyn_c3d_orca