Changeset 8373 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90

Timestamp:

2017-07-25T19:44:54+02:00 (7 years ago)

Author:

clem

Message:

remove most of wrk_alloc

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90 (modified) (10 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90

@@ -65 +65 @@
       REAL(wp) ::   zfp_ui, zfp_vj   !   -      -
       REAL(wp) ::   zfm_ui, zfm_vj   !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:) :: zt_ups, zfu_ups, zfv_ups, ztrd, zfu_ho, zfv_ho, zt_u, zt_v
+      REAL(wp), DIMENSION(jpi,jpj) :: zt_ups, zfu_ups, zfv_ups, ztrd, zfu_ho, zfv_ho, zt_u, zt_v
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('lim_adv_umx')
-      !
-      CALL wrk_alloc( jpi,jpj,   zt_ups, zfu_ups, zfv_ups, ztrd, zfu_ho, zfv_ho, zt_u, zt_v )
-      !
       !
       !  upstream advection with initial mass fluxes & intermediate update
@@ -145 +142 @@
       CALL lbc_lnk( ptc(:,:) , 'T',  1. )
       !
-      !
-      CALL wrk_dealloc( jpi,jpj,   zt_ups, zfu_ups, zfv_ups, ztrd, zfu_ho, zfv_ho, zt_u, zt_v )
-      !
       IF( nn_timing == 1 )  CALL timing_stop('lim_adv_umx')
       !
@@ -174 +168 @@
       INTEGER  ::   ji, jj    ! dummy loop indices
       REAL(wp) ::   zc_box    !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:) :: zzt
+      REAL(wp), DIMENSION(jpi,jpj) :: zzt
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('macho')
-      !
-      CALL wrk_alloc( jpi,jpj,   zzt )
       !
       IF( MOD( (kt - 1) / nn_fsbc , 2 ) == 0 ) THEN         !==  odd ice time step:  adv_x then adv_y  ==!
@@ -219 +211 @@
       ENDIF      
       !
-      CALL wrk_dealloc( jpi,jpj,   zzt )
-      !
       IF( nn_timing == 1 )  CALL timing_stop('macho')
       !
@@ -245 +235 @@
       INTEGER  ::   ji, jj       ! dummy loop indices
       REAL(wp) ::   zcu, zdx2, zdx4    !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:) :: ztu1, ztu2, ztu3, ztu4
+      REAL(wp), DIMENSION(jpi,jpj) :: ztu1, ztu2, ztu3, ztu4
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('ultimate_x')
-      !
-      CALL wrk_alloc( jpi,jpj,   ztu1, ztu2, ztu3, ztu4 )
       !
       !                                                     !--  Laplacian in i-direction  --!
@@ -346 +334 @@
       END SELECT
       !
-      CALL wrk_dealloc( jpi,jpj,   ztu1, ztu2, ztu3, ztu4 )
-      !
       IF( nn_timing == 1 )  CALL timing_stop('ultimate_x')
       !
@@ -372 +358 @@
       INTEGER  ::   ji, jj       ! dummy loop indices
       REAL(wp) ::   zcv, zdy2, zdy4    !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:) :: ztv1, ztv2, ztv3, ztv4
+      REAL(wp), DIMENSION(jpi,jpj) :: ztv1, ztv2, ztv3, ztv4
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('ultimate_y')
-      !
-      CALL wrk_alloc( jpi,jpj,   ztv1, ztv2, ztv3, ztv4 )
       !
       !                                                     !--  Laplacian in j-direction  --!
@@ -474 +458 @@
       END SELECT
       !
-      CALL wrk_dealloc( jpi,jpj,   ztv1, ztv2, ztv3, ztv4 )
-      !
       IF( nn_timing == 1 )  CALL timing_stop('ultimate_y')
       !
@@ -502 +484 @@
       REAL(wp) ::   zpos, zneg, zbt, za, zb, zc, zbig, zsml, z1_dt   ! local scalars
       REAL(wp) ::   zau, zbu, zcu, zav, zbv, zcv, zup, zdo            !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:) :: zbetup, zbetdo, zbup, zbdo, zmsk, zdiv
+      REAL(wp), DIMENSION(jpi,jpj) :: zbetup, zbetdo, zbup, zbdo, zmsk, zdiv
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('nonosc_2d')
-      !
-      CALL wrk_alloc( jpi,jpj,   zbetup, zbetdo, zbup, zbdo, zmsk, zdiv )
       !
       zbig = 1.e+40_wp
@@ -578 +558 @@
       CALL lbc_lnk_multi( paa, 'U', -1., pbb, 'V', -1. )   ! lateral boundary condition (changed sign)
       !
-      CALL wrk_dealloc( jpi,jpj,   zbetup, zbetdo, zbup, zbdo, zmsk, zdiv )
-      !
       IF( nn_timing == 1 )  CALL timing_stop('nonosc_2d')
       !