Changeset 12732 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/TRA

Timestamp:

2020-04-09T21:06:01+02:00 (4 years ago)

Author:

techene

Message:

some cleaning and proper module/routine name, mini bug introduced and corrected in sbcice_cice

File:

• NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/TRA/traatf_qco.F90 (moved) (moved from NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/TRA/traatfQCO.F90) (5 diffs)

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/TRA/traatf_qco.F90

@@ -53 +53 @@
 
    PUBLIC   tra_atf_qco       ! routine called by step.F90
-   PUBLIC   tra_atf_fix_lf   ! to be used in trcnxt !!st WARNING discrepancy here interpol is used
-   PUBLIC   tra_atf_qco_lf    ! to be used in trcnxt !!st WARNING discrepancy here interpol is used
+   PUBLIC   tra_atf_fix_lf    ! to be used in trcnxt !!st WARNING discrepancy here interpol is used by PISCES
+   PUBLIC   tra_atf_qco_lf    ! to be used in trcnxt !!st WARNING discrepancy here interpol is used by PISCES
 
    !! * Substitutions
@@ -103 +103 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~'
       ENDIF
-
-!       ! Update after tracer on domain lateral boundaries
-!       !
-! #if defined key_agrif
-!       CALL Agrif_tra                     ! AGRIF zoom boundaries
-! #endif
-!       !                                              ! local domain boundaries  (T-point, unchanged sign)
-!       CALL lbc_lnk_multi( 'traatfLF', pts(:,:,:,jp_tem,Kaa), 'T', 1., pts(:,:,:,jp_sal,Kaa), 'T', 1. )
-!       !
-!       IF( ln_bdy )   CALL bdy_tra( kt, Kbb, pts, Kaa )  ! BDY open boundaries
+!!st  Update after tracer on domain lateral boundaries as been removed outside 
 
       ! trends computation initialisation
@@ -127 +118 @@
          ! G Nurser 23 Mar 2017. Recalculate trend as Delta(e3t*T)/e3tn; e3tn cancel from pts(Kmm) terms
          DO jk = 1, jpkm1
-            ! ztrdt(:,:,jk) = ( pts(:,:,jk,jp_tem,Kaa)*e3t(:,:,jk,Kaa) / e3t(:,:,jk,Kmm) - pts(:,:,jk,jp_tem,Kmm)) * zfact
-            ! ztrds(:,:,jk) = ( pts(:,:,jk,jp_sal,Kaa)*e3t(:,:,jk,Kaa) / e3t(:,:,jk,Kmm) - pts(:,:,jk,jp_sal,Kmm)) * zfact
             ztrdt(:,:,jk) = ( pts(:,:,jk,jp_tem,Kaa) * (1._wp + r3t(:,:,Kaa) * tmask(:,:,jk))/(1._wp + r3t(:,:,Kmm) * tmask(:,:,jk))  &
                &            - pts(:,:,jk,jp_tem,Kmm) ) * zfact
@@ -251 +240 @@
       INTEGER  ::   ji, jj, jk, jn              ! dummy loop indices
       REAL(wp) ::   zfact, zfact1, ztc_a , ztc_n , ztc_b , ztc_f , ztc_d    ! local scalar
-      REAL(wp) ::   zfact2, ze3t_b, ze3t_n, ze3t_a, ze3t_f, ze3t_d  !   -      -
+      REAL(wp) ::   zfact2, ze3t_b, ze3t_n, ze3t_a, ze3t_f                  !   -      -
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   ztrd_atf
       !!----------------------------------------------------------------------
@@ -288 +277 @@
             ztc_a  = pt(ji,jj,jk,jn,Kaa) * ze3t_a
             !
-            ze3t_d = ze3t_a - 2. * ze3t_n + ze3t_b
             ztc_d  = ztc_a  - 2. * ztc_n  + ztc_b
             !