Changeset 3152 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.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/SBC/cpl_oasis4.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90

@@ -32 +32 @@
    USE lbclnk           ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp          ! MPP library
+   USE wrk_nemo_2       ! work arrays
 
    IMPLICIT NONE
@@ -111 +112 @@
       !! ** Method  :   OASIS4 MPI communication 
       !!--------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zclo => wrk_3d_1, zcla => wrk_3d_2
-      USE wrk_nemo, ONLY: zlon => wrk_2d_1, zlat => wrk_2d_2
-      !
       INTEGER, INTENT(in) :: krcv, ksnd     ! Number of received and sent coupling fields
       !
@@ -145 +142 @@
       TYPE(PRISM_Time_struct)    :: tmpdate
       INTEGER                    :: idate_incr      ! date increment
-      !!--------------------------------------------------------------------
-
-      IF( wrk_in_use(3, 1,2) .OR. wrk_in_use(2, 1,2) )THEN
-         CALL ctl_stop('cpl_prism_define: ERROR: requested workspace arrays are unavailable.')   ;   RETURN
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:)   ::   zlon, zlat
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zclo, zcla
+      !!--------------------------------------------------------------------
+      
+      CALL wrk_alloc( jpi,jpj, zlon, zlat )
+      CALL wrk_alloc( jpi,jpj,jpk, zclo, zcla )
 
       IF(lwp) WRITE(numout,*)
@@ -322 +320 @@
       IF ( nerror /= PRISM_Success )   CALL prism_abort ( ncomp_id, 'cpl_prism_define', 'Failure in prism_enddef')
       
-      IF( wrk_not_released(3, 1,2) .OR.   &
-          wrk_not_released(2, 1,2)   )   CALL ctl_stop('cpl_prism_define: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, zlon, zlat )
+      CALL wrk_dealloc( jpi,jpj,jpk, zclo, zcla )
       !
    END SUBROUTINE cpl_prism_define