Changeset 9125 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY

Timestamp:

2017-12-19T09:47:17+01:00 (7 years ago)

Author:

timgraham

Message:

Removed wrk_arrays from whole code. No change in SETTE results from this.

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydyn.F90 (modified) (4 diffs)
• bdytides.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90

@@ -16 +16 @@
    !!                    conditions
    !!----------------------------------------------------------------------
-   USE wrk_nemo        ! Memory Allocation
    USE oce             ! ocean dynamics and tracers 
    USE dom_oce         ! ocean space and time domain
@@ -50 +49 @@
       INTEGER ::   jk, ii, ij, ib_bdy, ib, igrd     ! Loop counter
       LOGICAL ::   ll_dyn2d, ll_dyn3d, ll_orlanski
-      REAL(wp), POINTER, DIMENSION(:,:) :: pua2d, pva2d     ! after barotropic velocities
+      REAL(wp), DIMENSION(jpi,jpj) :: pua2d, pva2d     ! after barotropic velocities
       !!----------------------------------------------------------------------
       !
@@ -65 +64 @@
      &   .OR. cn_dyn3d(ib_bdy) == 'orlanski' .OR. cn_dyn3d(ib_bdy) == 'orlanski_npo')   ll_orlanski = .true.
       END DO
-
-      !-------------------------------------------------------
-      ! Set pointers
-      !-------------------------------------------------------
-
-      CALL wrk_alloc( jpi,jpj,   pua2d, pva2d ) 
 
       !-------------------------------------------------------
@@ -124 +117 @@
       END IF
       !
-      CALL wrk_dealloc( jpi,jpj,  pua2d, pva2d ) 
-      !
    END SUBROUTINE bdy_dyn
 

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

@@ -25 +25 @@
    USE fldread        !
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
-   USE wrk_nemo       ! Memory allocation
 
    IMPLICIT NONE
@@ -75 +74 @@
       CHARACTER(len=80)                         ::   clfile              !: full file name for tidal input file 
       REAL(wp),ALLOCATABLE, DIMENSION(:,:,:)    ::   dta_read            !: work space to read in tidal harmonics data
-      REAL(wp), POINTER, DIMENSION(:,:)         ::   ztr, zti            !:  "     "    "   "   "   "        "      " 
+      REAL(wp),ALLOCATABLE, DIMENSION(:,:)      ::   ztr, zti            !:  "     "    "   "   "   "        "      " 
       !!
       TYPE(TIDES_DATA),  POINTER                ::   td                  !: local short cut   
@@ -150 +149 @@
                ! given on the global domain (ie global, jpiglo x jpjglo)
                !
-               CALL wrk_alloc( jpi,jpj,   zti, ztr )
+               ALLOCATE( zti(jpi,jpj), ztr(jpi,jpj) )
                !
                ! SSH fields
@@ -200 +199 @@
                CALL iom_close( inum )
                !
-               CALL wrk_dealloc( jpi,jpj,   ztr, zti ) 
+               DEALLOCATE( ztr, zti ) 
                !
             ELSE