Changeset 3152 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

Timestamp:

2011-11-18T10:19:26+01:00 (12 years ago)

Author:

smasson

Message:

dev_NEMO_MERGE_2011: new dynamical allocation in IOM and SBC

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -10 +10 @@
    USE in_out_manager   ! I/O manager
    USE lib_mpp          ! distributed memory computing
+   USE wrk_nemo_2       ! work arrays
 
    IMPLICIT NONE
@@ -74 +75 @@
       !!                    clinfo3 : additional information 
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztab2d_1 => wrk_2d_30 , ztab2d_2 => wrk_2d_31
-      USE wrk_nemo, ONLY:   zmask1   => wrk_3d_11 , zmask2   => wrk_3d_12 
-      USE wrk_nemo, ONLY:   ztab3d_1 => wrk_3d_13 , ztab3d_2 => wrk_3d_14
-      !
       REAL(wp), DIMENSION(:,:)  , INTENT(in), OPTIONAL ::   tab2d_1
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL ::   tab3d_1
@@ -94 +90 @@
       INTEGER ::   overlap, jn, sind, eind, kdir,j_id
       REAL(wp) :: zsum1, zsum2, zvctl1, zvctl2
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 30,31) .OR. wrk_in_use(3, 11,12,13,14) ) THEN
-         CALL ctl_stop('prt_ctl : requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:)   :: ztab2d_1, ztab2d_2
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zmask1, zmask2, ztab3d_1, ztab3d_2
+      !!----------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi,jpj, ztab2d_1, ztab2d_2 )
+      CALL wrk_alloc( jpi,jpj,jpk, zmask1, zmask2, ztab3d_1, ztab3d_2 )
 
       ! Arrays, scalars initialization 
@@ -205 +202 @@
       ENDDO
 
-      IF( wrk_not_released(2, 30,31)     .OR.   &
-          wrk_not_released(3, 11,12,13,14) )   CALL ctl_stop('prt_ctl: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, ztab2d_1, ztab2d_2 )
+      CALL wrk_dealloc( jpi,jpj,jpk, zmask1, zmask2, ztab3d_1, ztab3d_2 )
       !
    END SUBROUTINE prt_ctl