Changeset 9987 for branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

Timestamp:

2018-07-23T11:33:03+02:00 (6 years ago)

Author:

emmafiedler

Message:

Merge with GO6 FOAMv14 package branch r9288

File:

• branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (6 diffs)

branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -26 +26 @@
    USE ldfslp          ! iso-neutral slopes
    USE diaptr          ! poleward transport diagnostics
+   USE trd_oce         ! trends: ocean variables
+   USE trdtra          ! trends manager: tracers 
    USE in_out_manager  ! I/O manager
    USE iom             ! I/O library
    USE phycst          ! physical constants
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
 
@@ -105 +106 @@
       INTEGER  ::  ji, jj, jk, jn   ! dummy loop indices
       INTEGER  ::  ikt
-      REAL(wp) ::  zmsku, zabe1, zcof1, zcoef3   ! local scalars
-      REAL(wp) ::  zmskv, zabe2, zcof2, zcoef4   !   -      -
-      REAL(wp) ::  zcoef0, zbtr, ztra            !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zdkt, zdk1t, zdit, zdjt, ztfw 
+      REAL(wp) ::  zmsku, zabe1, zcof1, zcoef3       ! local scalars
+      REAL(wp) ::  zmskv, zabe2, zcof2, zcoef4       !   -      -
+      REAL(wp) ::  zcoef0, zbtr                      !   -      -
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) ::  z2d
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::  zdkt, zdk1t, zdit, zdjt, ztfw 
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), TARGET ::  ztrax, ztray, ztraz 
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), TARGET ::  ztrax_T, ztray_T, ztraz_T
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('tra_ldf_iso')
       !
-      CALL wrk_alloc( jpi, jpj,      z2d ) 
-      CALL wrk_alloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t ) 
+      ALLOCATE( z2d(1:jpi, 1:jpj)) 
+      ALLOCATE( zdit(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE( zdjt(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( ztfw(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( zdkt(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( zdk1t(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( ztrax(1:jpi,1:jpj,1:jpk)) 
+      ALLOCATE( ztray(1:jpi,1:jpj,1:jpk))
+      ALLOCATE( ztraz(1:jpi,1:jpj,1:jpk) ) 
+      IF( l_trdtra .and. cdtype == 'TRA' ) THEN
+         ALLOCATE( ztrax_T(1:jpi,1:jpj,1:jpk)) 
+         ALLOCATE( ztray_T(1:jpi,1:jpj,1:jpk)) 
+         ALLOCATE( ztraz_T(1:jpi,1:jpj,1:jpk)) 
+      ENDIF
       !
 
@@ -127 +142 @@
       DO jn = 1, kjpt                                            ! tracer loop
          !                                                       ! ===========
+         ztrax(:,:,:) = 0._wp ; ztray(:,:,:) = 0._wp ; ztraz(:,:,:) = 0._wp ; 
          !                                               
          !!----------------------------------------------------------------------
@@ -226 +242 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) )
-                  ztra = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk)  )
-                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra
+                  ztrax(ji,jj,jk) = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) )
+                  ztray(ji,jj,jk) = zbtr * ( zftv(ji,jj,jk) - zftv(ji,jj-1,jk) )
                END DO
             END DO
@@ -234 +250 @@
          !                                             ! ===============
          !
+         pta(:,:,:,jn) = pta(:,:,:,jn) + ztrax(:,:,:) + ztray(:,:,:)
+         !
          ! "Poleward" diffusive heat or salt transports (T-S case only)
-         IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN
             ! note sign is reversed to give down-gradient diffusive transports (#1043)
-            IF( jn == jp_tem)   htr_ldf(:) = ptr_sj( -zftv(:,:,:) )
-            IF( jn == jp_sal)   str_ldf(:) = ptr_sj( -zftv(:,:,:) )
-         ENDIF
+         IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL dia_ptr_ohst_components( jn, 'ldf', -zftv(:,:,:)  )
  
          IF( iom_use("udiff_heattr") .OR. iom_use("vdiff_heattr") ) THEN
@@ -314 +329 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) )
-                  ztra = (  ztfw(ji,jj,jk) - ztfw(ji,jj,jk+1)  ) * zbtr
-                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra
+                  ztraz(ji,jj,jk) = (  ztfw(ji,jj,jk) - ztfw(ji,jj,jk+1)  ) * zbtr
                END DO
             END DO
          END DO
+         pta(:,:,:,jn) = pta(:,:,:,jn) + ztraz(:,:,:)
          !
+         IF( l_trdtra .AND. cdtype == "TRA" .AND. jn .eq. 1 )  THEN      ! save the temperature trends
+            ztrax_T(:,:,:) = ztrax(:,:,:)
+            ztray_T(:,:,:) = ztray(:,:,:)
+            ztraz_T(:,:,:) = ztraz(:,:,:)
+         ENDIF
+         IF( l_trdtrc .AND. cdtype == "TRC" )   THEN      ! save the horizontal component of diffusive trends for further diagnostics
+            CALL trd_tra( kt, cdtype, jn, jptra_iso_x, ztrax )
+            CALL trd_tra( kt, cdtype, jn, jptra_iso_y, ztray ) 
+            CALL trd_tra( kt, cdtype, jn, jptra_iso_z1, ztraz )  ! This is the first part of the vertical component.
+         ENDIF
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj, z2d ) 
-      CALL wrk_dealloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t ) 
+      IF( l_trdtra .AND. cdtype == "TRA" )   THEN      ! save the horizontal component of diffusive trends for further diagnostics
+         CALL trd_tra( kt, cdtype, jp_tem, jptra_iso_x, ztrax_T )
+         CALL trd_tra( kt, cdtype, jp_sal, jptra_iso_x, ztrax )
+         CALL trd_tra( kt, cdtype, jp_tem, jptra_iso_y, ztray_T )
+         CALL trd_tra( kt, cdtype, jp_sal, jptra_iso_y, ztray )
+         CALL trd_tra( kt, cdtype, jp_tem, jptra_iso_z1, ztraz_T )  ! This is the first part of the vertical component
+         CALL trd_tra( kt, cdtype, jp_sal, jptra_iso_z1, ztraz )    !
+      ENDIF
+      !
+      DEALLOCATE( z2d ) 
+      DEALLOCATE( zdit) 
+      DEALLOCATE( zdjt)
+      DEALLOCATE( ztfw) 
+      DEALLOCATE( zdkt )
+      DEALLOCATE( zdk1t ) 
+      DEALLOCATE( ztrax, ztray, ztraz ) 
+      IF( l_trdtra  .and. cdtype == 'TRA' ) DEALLOCATE( ztrax_T, ztray_T, ztraz_T ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_ldf_iso')