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

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

@@ -20 +20 @@
    USE geo2ocean       ! for vector rotation on to model grid
    USE lib_mpp         ! MPP library
+   USE wrk_nemo_2      ! work arrays
    USE ioipsl, ONLY :   ymds2ju, ju2ymds   ! for calendar
 
@@ -704 +705 @@
       !! ** Purpose :   Vector fields may need to be rotated onto the local grid direction
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: utmp => wrk_2d_24, vtmp => wrk_2d_25      ! 2D workspace
-      !!
       INTEGER  , INTENT(in   )               ::   kt        ! ocean time step
       TYPE(FLD), INTENT(inout), DIMENSION(:) ::   sd        ! input field related variables
       !!
-      INTEGER                      ::   ju, jv, jk   ! loop indices
-      INTEGER                      ::   imf          ! size of the structure sd
-      INTEGER                      ::   ill          ! character length
-      INTEGER                      ::   iv           ! indice of V component
-      CHARACTER (LEN=100)          ::   clcomp       ! dummy weight name
-      !!---------------------------------------------------------------------
-
-      IF(wrk_in_use(2, 24,25) ) THEN
-         CALL ctl_stop('fld_rot: ERROR: requested workspace arrays are unavailable.')   ;   RETURN
-      END IF
+      INTEGER                           ::   ju, jv, jk   ! loop indices
+      INTEGER                           ::   imf          ! size of the structure sd
+      INTEGER                           ::   ill          ! character length
+      INTEGER                           ::   iv           ! indice of V component
+      REAL(wp), POINTER, DIMENSION(:,:) ::   utmp, vtmp   ! temporary arrays for vector rotation
+      CHARACTER (LEN=100)               ::   clcomp       ! dummy weight name
+      !!---------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi,jpj, utmp, vtmp )
 
       !! (sga: following code should be modified so that pairs arent searched for each time
@@ -754 +751 @@
        END DO
       !
-      IF(wrk_not_released(2, 24,25) )    CALL ctl_stop('fld_rot: ERROR: failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi,jpj, utmp, vtmp )
       !
    END SUBROUTINE fld_rot
@@ -921 +918 @@
       !!                file, restructuring as required
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
-      USE wrk_nemo, ONLY:   data_tmp =>  wrk_2d_1     ! 2D real    workspace
-      USE wrk_nemo, ONLY:   data_src => iwrk_2d_1     ! 2D integer workspace
-      !!
       TYPE( FLD ), INTENT(in) ::   sd   ! field with name of weights file
       !!
-      INTEGER                ::   jn            ! dummy loop indices
-      INTEGER                ::   inum          ! temporary logical unit
-      INTEGER                ::   id            ! temporary variable id
-      INTEGER                ::   ipk           ! temporary vertical dimension
-      CHARACTER (len=5)      ::   aname
-      INTEGER , DIMENSION(3) ::   ddims
-      LOGICAL                ::   cyclical
-      INTEGER                ::   zwrap      ! local integer
-      !!----------------------------------------------------------------------
-      !
-      IF(  wrk_in_use(2, 1)  .OR.  iwrk_in_use(2,1) ) THEN
-         CALL ctl_stop('fld_weight: requested workspace arrays are unavailable')   ;   RETURN
-      ENDIF
+      INTEGER                           ::   jn            ! dummy loop indices
+      INTEGER                           ::   inum          ! temporary logical unit
+      INTEGER                           ::   id            ! temporary variable id
+      INTEGER                           ::   ipk           ! temporary vertical dimension
+      CHARACTER (len=5)                 ::   aname
+      INTEGER , DIMENSION(3)            ::   ddims
+      INTEGER , POINTER, DIMENSION(:,:) ::   data_src
+      REAL(wp), POINTER, DIMENSION(:,:) ::   data_tmp
+      LOGICAL                           ::   cyclical
+      INTEGER                           ::   zwrap      ! local integer
+      !!----------------------------------------------------------------------
+      !
+      CALL wrk_alloc( jpi,jpj, data_src )   ! integer
+      CALL wrk_alloc( jpi,jpj, data_tmp )
       !
       IF( nxt_wgt > tot_wgts ) THEN
@@ -1051 +1045 @@
       ENDIF
 
-      IF(  wrk_not_released(2, 1) .OR.    &
-          iwrk_not_released(2, 1)  )   CALL ctl_stop('fld_weight: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, data_src )   ! integer
+      CALL wrk_dealloc( jpi,jpj, data_tmp )
       !
    END SUBROUTINE fld_weight