Changeset 14053 for NEMO/trunk/src/OCE/TRA

Timestamp:

2020-12-03T14:48:38+01:00 (3 years ago)

Author:

techene

Message:

#2385 added to the trunk

Location:

NEMO/trunk/src/OCE/TRA

Files:

• traatf_qco.F90 (modified) (4 diffs)
• traqsr.F90 (modified) (2 diffs)
• trasbc.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/TRA/traatf_qco.F90

@@ -1 @@
-MODULE traatfqco
+MODULE traatf_qco
    !!======================================================================
-   !!                       ***  MODULE  traatfqco  ***
+   !!                       ***  MODULE  traatf_qco  ***
    !! Ocean active tracers:  Asselin time filtering for temperature and salinity
    !!======================================================================
@@ -45 +45 @@
    USE prtctl          ! Print control
    USE timing          ! Timing
-#if defined key_agrif
-   USE agrif_oce_interp
-#endif
 
    IMPLICIT NONE
@@ -149 +146 @@
          ENDIF
          !
-         CALL lbc_lnk_multi( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1., pts(:,:,:,jp_sal,Kmm) , 'T', 1. )
-
+         CALL lbc_lnk_multi( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1._wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1._wp )
+         !
       ENDIF
       !
@@ -370 +367 @@
 
    !!======================================================================
-END MODULE traatfqco
+END MODULE traatf_qco

NEMO/trunk/src/OCE/TRA/traqsr.F90

@@ -144 +144 @@
 
       IF( kt == nit000 ) THEN          !==  1st time step  ==!
-         IF( ln_rstart .AND. iom_varid( numror, 'qsr_hc_b', ldstop = .FALSE. ) > 0  .AND. .NOT.l_1st_euler ) THEN    ! read in restart
+         IF( ln_rstart .AND. .NOT.l_1st_euler ) THEN    ! read in restart
             z1_2 = 0.5_wp
             IF( ntile == 0 .OR. ntile == 1 )  THEN                        ! Do only on the first tile
@@ -150 +150 @@
                CALL iom_get( numror, jpdom_auto, 'qsr_hc_b', qsr_hc_b )   ! before heat content trend due to Qsr flux
             ENDIF
-         ELSE                                           ! No restart or restart not found: Euler forward time stepping
+         ELSE                                           ! No restart or Euler forward at 1st time step
             z1_2 = 1._wp
             DO_3D( isj, iej, isi, iei, 1, jpk )

NEMO/trunk/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 )