Changeset 6432 for branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA

Timestamp:

2016-04-06T09:51:41+02:00 (8 years ago)

Author:

timgraham

Message:

More bug fixes. Now compiles and passes SETTE tests

File:

• branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (3 diffs)

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

@@ -285 +285 @@
                    CALL wrk_dealloc( jpi, jpj, jpk, zwi, zwz )
       IF( l_trd )  CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz )
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN wrk_dealloc( jpi, nptr, ptr_adv_tmp )
+      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, nptr, ptr_adv_tmp )
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd')
@@ -333 +333 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz
       REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrs
+      REAL(wp), POINTER, DIMENSION(:,:) :: ptr_adv_tmp
       !!----------------------------------------------------------------------
       !
@@ -591 +592 @@
                    CALL wrk_dealloc( jpi, jpj, zwx_sav, zwy_sav )
       IF( l_trd )  CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz )
-      IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN wrk_dealloc( jpi, nptr, ptr_adv_tmp )
+      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, nptr, ptr_adv_tmp )
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd_zts')