Changeset 9863 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/TRP/trcnxt.F90

Timestamp:

2018-06-30T12:51:02+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): simplified implementation of the Euler stepping at nit000

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/TRP/trcnxt.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/TRP/trcnxt.F90

@@ -24 +24 @@
    !!   'key_top'                                                TOP models
    !!----------------------------------------------------------------------
-   !!   trc_nxt     : time stepping on passive tracers
-   !!----------------------------------------------------------------------
-   USE oce_trc         ! ocean dynamics and tracers variables
-   USE trc             ! ocean passive tracers variables
-   USE trd_oce
-   USE trdtra
-   USE tranxt
-   USE bdy_oce   , ONLY: ln_bdy
-   USE trcbdy          ! BDY open boundaries
+
+   !!----------------------------------------------------------------------
+   !!   trc_nxt       : time stepping on passive tracers
+   !!----------------------------------------------------------------------
+   USE oce_trc        ! ocean dynamics and tracers variables
+   USE trc            ! ocean passive tracers variables
+   USE trd_oce        ! 
+   USE trdtra         !
+   USE tranxt         !
+   USE bdy_oce , ONLY : ln_bdy
+   USE trcbdy         ! BDY open boundaries
 # if defined key_agrif
    USE agrif_top_interp
 # endif
    !
-   USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE prtctl_trc      ! Print control for debbuging
+   USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
+   USE prtctl_trc     ! Print control for debbuging
 
    IMPLICIT NONE
@@ -81 +83 @@
       !
       INTEGER  ::   jk, jn   ! dummy loop indices
-      REAL(wp) ::   zfact            ! temporary scalar
+      REAL(wp) ::   zfact    ! local scalar
       CHARACTER (len=22) :: charout
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   ztrdt    ! 4D workspace
@@ -99 +101 @@
       CALL lbc_lnk( tra(:,:,:,:), 'T', 1. )   
 
-      IF( ln_bdy )  CALL trc_bdy( kt )
+      IF( ln_bdy )   CALL trc_bdy( kt )
 
       IF( l_trdtrc )  THEN             ! trends: store now fields before the Asselin filter application
          ALLOCATE( ztrdt(jpi,jpj,jpk,jptra) )
-         ztrdt(:,:,:,:)  = trn(:,:,:,:)
+         ztrdt(:,:,:,:) = trn(:,:,:,:)
       ENDIF
       !                                ! Leap-Frog + Asselin filter time stepping
-      IF( (neuler == 0 .AND. kt == nittrc000) .OR. ln_top_euler ) THEN    ! Euler time-stepping (only swap)
+      IF( l_1st_euler .OR. ln_top_euler ) THEN    ! Euler time-stepping (only swap)
          DO jn = 1, jptra
             DO jk = 1, jpkm1
@@ -208 +210 @@
                   ztc_f  = ztc_n  + atfp * ztc_d
                   !
-                  IF( .NOT. ln_linssh .AND. jk == mikt(ji,jj) ) THEN           ! first level 
+                  IF( .NOT. ln_linssh .AND. jk == mikt(ji,jj) ) THEN           ! top ocean level 
                      ze3t_f = ze3t_f - rfact2 * ( emp_b(ji,jj)      - emp(ji,jj)   ) 
                      ztc_f  = ztc_f  - rfact1 * ( sbc_trc(ji,jj,jn) - sbc_trc_b(ji,jj,jn) )
                   ENDIF
-
-                  ze3t_f = 1.e0 / ze3t_f
-                  trb(ji,jj,jk,jn) = ztc_f * ze3t_f       ! ptb <-- ptn filtered
+                  !
+                  trb(ji,jj,jk,jn) = ztc_f / ze3t_f       ! ptb <-- ptn filtered
                   trn(ji,jj,jk,jn) = tra(ji,jj,jk,jn)     ! ptn <-- pta
-                  !
                END DO
             END DO