Changeset 14062 for NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/TRA/trasbc.F90

Timestamp:

2020-12-03T17:39:30+01:00 (4 years ago)

Author:

ayoung

Message:

Updating to trunk at 14060 and resolving conflicts with ticket #2480. Ticket #2506.

File:

• NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/TRA/trasbc.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/TRA/trasbc.F90

@@ -72 +72 @@
       !!              - send trends to trdtra module for further diagnostics(l_trdtra=T)
       !!----------------------------------------------------------------------
-      INTEGER,                                   INTENT(in   ) :: kt         ! ocean time-step index
-      INTEGER,                                   INTENT(in   ) :: Kmm, Krhs  ! time level indices
-      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) :: pts        ! active tracers and RHS of tracer equation
+      INTEGER,                                   INTENT(in   ) ::   kt         ! ocean time-step index
+      INTEGER,                                   INTENT(in   ) ::   Kmm, Krhs  ! time level indices
+      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) ::   pts        ! active tracers and RHS of tracer Eq.
       !
       INTEGER  ::   ji, jj, jk, jn               ! dummy loop indices
@@ -117 +117 @@
       !                             !==  Set before sbc tracer content fields  ==!
       IF( kt == nit000 ) THEN             !* 1st time-step
-         IF( ln_rstart .AND.    &               ! Restart: read in restart file
-              & iom_varid( numror, 'sbc_hc_b', ldstop = .FALSE. ) > 0 ) THEN
+         IF( ln_rstart .AND. .NOT.l_1st_euler ) THEN      ! Restart: read in restart file
             zfact = 0.5_wp
             IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
@@ -126 +125 @@
                CALL iom_get( numror, jpdom_auto, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal) )   ! before salt content sbc trend
             ENDIF
-         ELSE                                   ! No restart or restart not found: Euler forward time stepping
+         ELSE                                             ! No restart or restart not found: Euler forward time stepping
             zfact = 1._wp
             DO_2D( isj, iej, isi, iei )