Changeset 3183 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90

Timestamp:

2011-11-25T16:31:02+01:00 (13 years ago)

Author:

davestorkey

Message:

Update dynamic allocation in OBS and ASM modules.

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified) (5 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90

@@ -9 +9 @@
    !!----------------------------------------------------------------------
    !! * Modules used   
+   USE wrk_nemo_2               ! Memory Allocation
    USE par_kind                 ! Precision variables
    USE par_oce                  ! Ocean parameters
@@ -55 +56 @@
       !!----------------------------------------------------------------------
       !! * Modules used
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released   
-      USE wrk_nemo, ONLY: zsingu => wrk_2d_1, zcosgu => wrk_2d_2, &
-                          zsingv => wrk_2d_3, zcosgv => wrk_2d_4
       !! * Arguments
       TYPE(obs_prof), INTENT(INOUT) :: profdata    ! Profile data to be read
@@ -85 +83 @@
       REAL(wp) :: zcos
       REAL(wp), DIMENSION(1) :: zobsmask
+      REAL(wp), POINTER, DIMENSION(:,:) :: zsingu,zcosgu,zsingv,zcosgv
       INTEGER, DIMENSION(:,:,:), ALLOCATABLE :: &
          & igrdiu, &
@@ -93 +92 @@
       INTEGER :: jk
 
-      IF(wrk_in_use(2, 1,2,3,4))THEN
-         CALL ctl_stop('obs_rotvel : requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      CALL wrk_alloc(jpi,jpj,zsingu,zcosgu,zsingv,zcosgv) 
 
       !-----------------------------------------------------------------------
@@ -229 +225 @@
          & )
 
-      IF(wrk_not_released(2, 1,2,3,4))THEN
-         CALL ctl_stop('obs_rotvel : failed to release workspace arrays.')
-      END IF
+      CALL wrk_dealloc(jpi,jpj,zsingu,zcosgu,zsingv,zcosgv) 
 
    END SUBROUTINE obs_rotvel