Changeset 8193 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

Timestamp:

2017-06-20T10:46:27+02:00 (7 years ago)

Author:

andmirek

Message:

ticket #1914 back to 8188

File:

• branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (10 diffs)

branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -86 +86 @@
       REAL(wp) ::   zfp_ui, zfp_vj, zfp_wk   !   -      -
       REAL(wp) ::   zfm_ui, zfm_vj, zfm_wk   !   -      -
-<<<<<<< .working
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zwi, zwz
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz, zptry
       REAL(wp), ALLOCATABLE, DIMENSION(:,:)   :: z2d
-=======
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwz
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz, zptry
-      REAL(wp), POINTER, DIMENSION(:,:)   :: z2d
->>>>>>> .merge-right.r7923
       !!----------------------------------------------------------------------
       !
@@ -114 +108 @@
       IF( cdtype == 'TRA' .AND. (iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") ) ) l_trans = .TRUE.
       !
-<<<<<<< .working
       IF( l_trd .OR. l_trans )  THEN
          ALLOCATE(ztrdx(1:jpi, 1:jpj, 1:jpk))
          ALLOCATE(ztrdy(1:jpi, 1:jpj, 1:jpk))
          ALLOCATE(ztrdz(1:jpi, 1:jpj, 1:jpk))
-=======
-      IF( l_trd .OR. l_trans )  THEN
-         CALL wrk_alloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz )
->>>>>>> .merge-right.r7923
          ztrdx(:,:,:) = 0.e0   ;    ztrdy(:,:,:) = 0.e0   ;   ztrdz(:,:,:) = 0.e0
-<<<<<<< .working
          ALLOCATE(z2d(1:jpi, 1:jpj))
-=======
-         CALL wrk_alloc( jpi, jpj, z2d )
->>>>>>> .merge-right.r7923
       ENDIF
       !
-<<<<<<< .working
       IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
          ALLOCATE(zptry(1:jpi, 1:jpj, 1:jpk))
@@ -137 +121 @@
       ENDIF
       !
-=======
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
-         CALL wrk_alloc( jpi, jpj, jpk, zptry )
-         zptry(:,:,:) = 0._wp
-      ENDIF
-      !
->>>>>>> .merge-right.r7923
       zwi(:,:,:) = 0.e0 ; 
       !
@@ -331 +308 @@
       END DO
       !
-<<<<<<< .working
       DEALLOCATE( zwi )
       DEALLOCATE( zwz )
@@ -341 +317 @@
       ENDIF
       IF( cdtype == 'TRA' .AND. ln_diaptr ) DEALLOCATE( zptry )
-=======
-      CALL wrk_dealloc( jpi, jpj, jpk, zwi, zwz )
-      IF( l_trd .OR. l_trans )  THEN 
-         CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz )
-         CALL wrk_dealloc( jpi, jpj, z2d )
-      ENDIF
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, jpj, jpk, zptry )
->>>>>>> .merge-right.r7923
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd')
@@ -392 +360 @@
       REAL(wp) ::   zfp_ui, zfp_vj, zfp_wk   !   -      -
       REAL(wp) ::   zfm_ui, zfm_vj, zfm_wk   !   -      -
-<<<<<<< .working
       REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) :: zwx_sav , zwy_sav
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zwi, zwz, zhdiv, zwz_sav, zwzts
@@ -398 +365 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zptry
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: ztrs
-=======
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zwx_sav , zwy_sav
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwz, zhdiv, zwz_sav, zwzts
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zptry
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrs
->>>>>>> .merge-right.r7923
       !!----------------------------------------------------------------------
       !
@@ -434 +394 @@
       ENDIF
       !
-<<<<<<< .working
       IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
          ALLOCATE(zptry(1:jpi, 1:jpj, 1:jpk))       
@@ -440 +399 @@
       ENDIF
       !
-=======
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
-         CALL wrk_alloc( jpi, jpj,jpk, zptry )
-         zptry(:,:,:) = 0._wp
-      ENDIF
-      !
->>>>>>> .merge-right.r7923
       zwi(:,:,:) = 0._wp
       z_rzts = 1._wp / REAL( jnzts, wp )
@@ -681 +633 @@
 
       IF( cdtype == 'TRA' .AND. ln_diaptr ) DEALLOCATE(zptry )
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, jpj, jpk, zptry )
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd_zts')