Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c2d.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_c2d.h90 (modified) (6 diffs)

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

@@ -140 +140 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY:   aht0
-      USE wrk_nemo  , ONLY:   iwrk_in_use, iwrk_not_released
-      USE wrk_nemo  , ONLY:   icof => iwrk_2d_1
       !
       LOGICAL, INTENT (in) ::   ld_print   ! If true, output arrays on numout
@@ -150 +148 @@
       REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk
       CHARACTER (len=15) ::   clexp
-      INTEGER, DIMENSION(jpidta,jpidta) ::   idata
-      !!----------------------------------------------------------------------
-
-      IF( iwrk_in_use(2, 1) )THEN
-         CALL ctl_stop('ldf_dyn_c2d_orca: requested workspace array is unavailable')   ;   RETURN
-      ENDIF
-
+      INTEGER, POINTER, DIMENSION(:,:)  :: icof
+      INTEGER, POINTER, DIMENSION(:,:)  :: idata
+      !!----------------------------------------------------------------------
+      !                                
+      CALL wrk_alloc( jpi   , jpj   , icof  )
+      CALL wrk_alloc( jpidta, jpjdta, idata )
+      !
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'inildf: 2d eddy viscosity coefficient'
@@ -280 +278 @@
          CALL prihre(ahm2,jpi,jpj,1,jpi,1,1,jpj,1,1.e-3,numout)
       ENDIF
-
-      IF( iwrk_not_released(2, 1) )   CALL ctl_stop('ldf_dyn_c2d_orca: failed to release workspace array')
+      !
+      CALL wrk_dealloc( jpi   , jpj   , icof  )
+      CALL wrk_dealloc( jpidta, jpjdta, idata )
       !
    END SUBROUTINE ldf_dyn_c2d_orca
@@ -302 +301 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY:   aht0
-      USE wrk_nemo  , ONLY:   iwrk_in_use, iwrk_not_released
-      USE wrk_nemo  , ONLY:   icof => iwrk_2d_1
       !
       LOGICAL, INTENT (in) ::   ld_print   ! If true, output arrays on numout
@@ -313 +310 @@
       REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk, zam20s
       CHARACTER (len=15) ::   clexp
-      INTEGER, DIMENSION(jpidta,jpidta) ::   idata
-      !!----------------------------------------------------------------------
-
-      IF( iwrk_in_use(2, 1) ) THEN
-         CALL ctl_stop('ldf_dyn_c2d_orca_R1: requested workspace array is unavailable')   ;   RETURN
-      ENDIF
+      INTEGER, POINTER, DIMENSION(:,:)  :: icof
+      INTEGER, POINTER, DIMENSION(:,:)  :: idata
+      !!----------------------------------------------------------------------
+      !                                
+      CALL wrk_alloc( jpi   , jpj   , icof  )
+      CALL wrk_alloc( jpidta, jpjdta, idata )
+      !                                
 
       IF(lwp) WRITE(numout,*)
@@ -450 +448 @@
          CALL prihre(ahm2,jpi,jpj,1,jpi,1,1,jpj,1,1.e-3,numout)
       ENDIF
-
-      IF( iwrk_not_released(2, 1) )   CALL ctl_stop('ldf_dyn_c2d_orca_R1: failed to release workspace array')
+      !
+      CALL wrk_dealloc( jpi   , jpj   , icof  )
+      CALL wrk_dealloc( jpidta, jpjdta, idata )
       !
    END SUBROUTINE ldf_dyn_c2d_orca_R1