Changeset 8191 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
- Timestamp:
- 2017-06-19T18:16:30+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r7771 r8191 86 86 REAL(wp) :: zfp_ui, zfp_vj, zfp_wk ! - - 87 87 REAL(wp) :: zfm_ui, zfm_vj, zfm_wk ! - - 88 <<<<<<< .working 88 89 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zwi, zwz 89 90 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz, zptry 90 91 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z2d 92 ======= 93 REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwz 94 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz, zptry 95 REAL(wp), POINTER, DIMENSION(:,:) :: z2d 96 >>>>>>> .merge-right.r7923 91 97 !!---------------------------------------------------------------------- 92 98 ! … … 108 114 IF( cdtype == 'TRA' .AND. (iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") ) ) l_trans = .TRUE. 109 115 ! 116 <<<<<<< .working 110 117 IF( l_trd .OR. l_trans ) THEN 111 118 ALLOCATE(ztrdx(1:jpi, 1:jpj, 1:jpk)) 112 119 ALLOCATE(ztrdy(1:jpi, 1:jpj, 1:jpk)) 113 120 ALLOCATE(ztrdz(1:jpi, 1:jpj, 1:jpk)) 121 ======= 122 IF( l_trd .OR. l_trans ) THEN 123 CALL wrk_alloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz ) 124 >>>>>>> .merge-right.r7923 114 125 ztrdx(:,:,:) = 0.e0 ; ztrdy(:,:,:) = 0.e0 ; ztrdz(:,:,:) = 0.e0 126 <<<<<<< .working 115 127 ALLOCATE(z2d(1:jpi, 1:jpj)) 116 ENDIF 117 ! 128 ======= 129 CALL wrk_alloc( jpi, jpj, z2d ) 130 >>>>>>> .merge-right.r7923 131 ENDIF 132 ! 133 <<<<<<< .working 118 134 IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN 119 135 ALLOCATE(zptry(1:jpi, 1:jpj, 1:jpk)) … … 121 137 ENDIF 122 138 ! 139 ======= 140 IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN 141 CALL wrk_alloc( jpi, jpj, jpk, zptry ) 142 zptry(:,:,:) = 0._wp 143 ENDIF 144 ! 145 >>>>>>> .merge-right.r7923 123 146 zwi(:,:,:) = 0.e0 ; 124 147 ! … … 308 331 END DO 309 332 ! 333 <<<<<<< .working 310 334 DEALLOCATE( zwi ) 311 335 DEALLOCATE( zwz ) … … 317 341 ENDIF 318 342 IF( cdtype == 'TRA' .AND. ln_diaptr ) DEALLOCATE( zptry ) 343 ======= 344 CALL wrk_dealloc( jpi, jpj, jpk, zwi, zwz ) 345 IF( l_trd .OR. l_trans ) THEN 346 CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz ) 347 CALL wrk_dealloc( jpi, jpj, z2d ) 348 ENDIF 349 IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, jpj, jpk, zptry ) 350 >>>>>>> .merge-right.r7923 319 351 ! 320 352 IF( nn_timing == 1 ) CALL timing_stop('tra_adv_tvd') … … 360 392 REAL(wp) :: zfp_ui, zfp_vj, zfp_wk ! - - 361 393 REAL(wp) :: zfm_ui, zfm_vj, zfm_wk ! - - 394 <<<<<<< .working 362 395 REAL(wp), ALLOCATABLE, DIMENSION(:,: ) :: zwx_sav , zwy_sav 363 396 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zwi, zwz, zhdiv, zwz_sav, zwzts … … 365 398 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zptry 366 399 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: ztrs 400 ======= 401 REAL(wp), POINTER, DIMENSION(:,: ) :: zwx_sav , zwy_sav 402 REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwz, zhdiv, zwz_sav, zwzts 403 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz 404 REAL(wp), POINTER, DIMENSION(:,:,:) :: zptry 405 REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrs 406 >>>>>>> .merge-right.r7923 367 407 !!---------------------------------------------------------------------- 368 408 ! … … 394 434 ENDIF 395 435 ! 436 <<<<<<< .working 396 437 IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN 397 438 ALLOCATE(zptry(1:jpi, 1:jpj, 1:jpk)) … … 399 440 ENDIF 400 441 ! 442 ======= 443 IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN 444 CALL wrk_alloc( jpi, jpj,jpk, zptry ) 445 zptry(:,:,:) = 0._wp 446 ENDIF 447 ! 448 >>>>>>> .merge-right.r7923 401 449 zwi(:,:,:) = 0._wp 402 450 z_rzts = 1._wp / REAL( jnzts, wp ) … … 633 681 634 682 IF( cdtype == 'TRA' .AND. ln_diaptr ) DEALLOCATE(zptry ) 683 IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, jpj, jpk, zptry ) 635 684 ! 636 685 IF( nn_timing == 1 ) CALL timing_stop('tra_adv_tvd_zts')
Note: See TracChangeset
for help on using the changeset viewer.