Changeset 12810 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/TRA/traadv_mus.F90

Timestamp:

2020-04-24T17:09:39+02:00 (4 years ago)

Author:

francesca

Message:

POINTER removal and replacing of traadv_mus.F90 file with original version - ticket #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/TRA/traadv_mus.F90 (modified) (8 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/TRA/traadv_mus.F90

@@ -31 +31 @@
    USE lbclnk         ! ocean lateral boundary condition (or mpp link) 
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
-   USE halo_mng
 
    IMPLICIT NONE
@@ -38 +37 @@
    PUBLIC   tra_adv_mus   ! routine called by traadv.F90
    
-   REAL(wp), POINTER, SAVE, DIMENSION(:,:)   ::   upsmsk   !: mixed upstream/centered scheme near some straits
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   upsmsk   !: mixed upstream/centered scheme near some straits
    !                                                           !  and in closed seas (orca 2 and 1 configurations)
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   xind     !: mixed upstream/centered index
@@ -45 +44 @@
    LOGICAL  ::   l_ptr   ! flag to compute poleward transport
    LOGICAL  ::   l_hst   ! flag to compute heat/salt transport
-
-   INTEGER :: jphls = 2
 
    !! * Substitutions
@@ -83 +80 @@
       LOGICAL                                  , INTENT(in   ) ::   ld_msc_ups      ! use upstream scheme within muscl
       REAL(wp)                                 , INTENT(in   ) ::   p2dt            ! tracer time-step
-      REAL(wp), POINTER, DIMENSION(:,:,:)      , INTENT(in   ) ::   pU, pV, pW      ! 3 ocean volume flux components
-      REAL(wp), POINTER, DIMENSION(:,:,:,:,:)  , INTENT(inout) ::   pt              ! tracers and RHS of tracer equation
+      REAL(wp), DIMENSION(jpi,jpj,jpk         ), INTENT(in   ) ::   pU, pV, pW      ! 3 ocean volume flux components
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt,jpt), INTENT(inout) ::   pt              ! tracers and RHS of tracer equation
       !
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
@@ -90 +87 @@
       REAL(wp) ::   zu, z0u, zzwx, zw , zalpha   ! local scalars
       REAL(wp) ::   zv, z0v, zzwy, z0w           !   -      -
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zwx, zslpx   ! 3D workspace
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zwy, zslpy   ! -      - 
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zwx, zslpx   ! 3D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zwy, zslpy   ! -      - 
       !!----------------------------------------------------------------------
       !
-      CALL halo_mng_set(jphls)
-
-      ALLOCATE(zwx(jpi,jpj,jpk))
-      ALLOCATE(zwy(jpi,jpj,jpk))
-      ALLOCATE(zslpx(jpi,jpj,jpk))
-      ALLOCATE(zslpy(jpi,jpj,jpk))
-
-      CALL halo_mng_resize(r1_e1e2t,'T', 1._wp)
-      CALL halo_mng_resize(r1_e1e2u,'U', 1._wp)
-      CALL halo_mng_resize(r1_e1e2v,'V', 1._wp)
-      CALL halo_mng_resize(tmask,'T', 1._wp)
-      CALL halo_mng_resize(wmask,'W', 1._wp)
-      CALL halo_mng_resize(umask,'U', 1._wp)
-      CALL halo_mng_resize(vmask,'V', 1._wp)
-      CALL halo_mng_resize(pt, 'T', 1._wp, kjpt=kjpt, fjpt=Kbb )
-      CALL halo_mng_resize(pt, 'T', 1._wp, kjpt=kjpt, fjpt=Krhs )
-      CALL halo_mng_resize(e3t,'T', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(e3u,'U', 1._wp, fillval=1._wp, fjpt=Kmm )
-      CALL halo_mng_resize(e3v,'V', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(e3w,'W', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(pU, 'U', -1._wp)
-      CALL halo_mng_resize(pV, 'V', -1._wp)
-      CALL halo_mng_resize(pW, 'W', 1._wp)
-      !
-      IF( ln_isfcav ) CALL halo_mng_resize(mikt,  'T', 1._wp)
-      IF( ld_msc_ups) CALL halo_mng_resize(rnfmsk,'T', 1._wp)
-      IF( ld_msc_ups) CALL halo_mng_resize(upsmsk,'T', 1._wp)
-
       IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
@@ -167 +136 @@
          END_3D
          ! lateral boundary conditions   (changed sign)
-         !CALL lbc_lnk_multi( 'traadv_mus', zwx, 'U', -1. , zwy, 'V', -1. )
+         CALL lbc_lnk_multi( 'traadv_mus', zwx, 'U', -1. , zwy, 'V', -1. )
          !                                !-- Slopes of tracer
          zslpx(:,:,jpk) = 0._wp                 ! bottom values
@@ -203 +172 @@
             zwy(ji,jj,jk) = pV(ji,jj,jk) * ( zalpha * zzwx + (1.-zalpha) * zzwy )
          END_3D
-         !CALL lbc_lnk_multi( 'traadv_mus', zwx, 'U', -1. , zwy, 'V', -1. )   ! lateral boundary conditions   (changed sign)
+         CALL lbc_lnk_multi( 'traadv_mus', zwx, 'U', -1. , zwy, 'V', -1. )   ! lateral boundary conditions   (changed sign)
          !
          DO_3D_00_00( 1, jpkm1 )
@@ -264 +233 @@
          !
       END DO                     ! end of tracer loop
-
-      DEALLOCATE(zwx,zwy)
-      DEALLOCATE(zslpx,zslpy)
-
-      CALL halo_mng_set(1)
-      !
-      CALL halo_mng_resize(r1_e1e2t,'T', 1._wp)
-      CALL halo_mng_resize(r1_e1e2u,'U', 1._wp)
-      CALL halo_mng_resize(r1_e1e2v,'V', 1._wp)
-      CALL halo_mng_resize(pt,'T', 1._wp, kjpt=kjpt, fjpt=Kbb )
-      CALL halo_mng_resize(pt,'T', 1._wp, kjpt=kjpt, fjpt=Krhs )
-      CALL halo_mng_resize(tmask,'T', 1._wp)
-      CALL halo_mng_resize(wmask,'W', 1._wp)
-      CALL halo_mng_resize(umask,'U', 1._wp)
-      CALL halo_mng_resize(vmask,'V', 1._wp)
-      CALL halo_mng_resize(e3t,'T', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(e3u,'U', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(e3v,'V', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(e3w,'W', 1._wp, fillval=1._wp, fjpt=Kmm)
-      CALL halo_mng_resize(pU,'U', 1._wp)
-      CALL halo_mng_resize(pV,'V', 1._wp)
-      CALL halo_mng_resize(pW,'W', 1._wp)
-
-      IF( ln_isfcav ) CALL halo_mng_resize(mikt, 'T', 1._wp)
-      IF( ld_msc_ups) CALL halo_mng_resize(rnfmsk, 'T', 1._wp)
-      IF( ld_msc_ups) CALL halo_mng_resize(upsmsk, 'T', 1._wp)
+      !
    END SUBROUTINE tra_adv_mus