Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -36 +36 @@
    USE lib_mpp         ! MPP library
    USE restart         ! restart
-   USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
 
@@ -60 +59 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   zuvd    ! U & V data workspace
+!!gm see comment further down
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   zuvd    ! U & V data workspace
+!!gm end
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('istate_init')
+      IF( ln_timing )   CALL timing_start('istate_init')
       !
       IF(lwp) WRITE(numout,*)
@@ -121 +122 @@
 !!gm to be moved in usrdef of C1D case
 !         IF ( ln_uvd_init .AND. lk_c1d ) THEN ! read 3D U and V data at nit000
-!            CALL wrk_alloc( jpi,jpj,jpk,2,   zuvd )
+!            ALLOCATE( zuvd(jpi,jpj,jpk,2) )
 !            CALL dta_uvd( nit000, zuvd )
 !            ub(:,:,:) = zuvd(:,:,:,1) ;  un(:,:,:) = ub(:,:,:)
 !            vb(:,:,:) = zuvd(:,:,:,2) ;  vn(:,:,:) = vb(:,:,:)
-!            CALL wrk_dealloc( jpi,jpj,jpk,2,   zuvd )
+!            DEALLOCATE( zuvd )
 !         ENDIF
          !
@@ -164 +165 @@
       vb_b(:,:) = vb_b(:,:) * r1_hv_b(:,:)
       !
-      IF( nn_timing == 1 )   CALL timing_stop('istate_init')
+      IF( ln_timing )   CALL timing_stop('istate_init')
       !
    END SUBROUTINE istate_init