Changeset 15028 for NEMO/branches/2021

Timestamp:

2021-06-19T10:53:10+02:00 (3 years ago)

Author:

techene

Message:

#2605 : additionnal cleaning sette ~OK (as stated previously) for MLF and RK3

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA

Files:

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

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traatf_qco.F90

@@ -203 +203 @@
       DO jn = 1, kjpt
          !
-         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
+         DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+!!st         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
             ztn = pt(ji,jj,jk,jn,Kmm)
             ztd = pt(ji,jj,jk,jn,Kaa) - 2._wp * ztn + pt(ji,jj,jk,jn,Kbb)  ! time laplacian on tracers
@@ -262 +263 @@
       IF( ( l_trdtra .AND. cdtype == 'TRA' ) .OR. ( l_trdtrc .AND. cdtype == 'TRC' ) )   THEN
          ALLOCATE( ztrd_atf(jpi,jpj,jpk,kjpt) )
-         ztrd_atf(:,:,:,:) = 0.0_wp
+         ztrd_atf(:,:,:,:) = 0._wp
       ENDIF
       zfact = 1._wp / p2dt
@@ -268 +269 @@
       zfact2 = zfact1 * r1_rho0
       DO jn = 1, kjpt
-         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
+         DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+!!st         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
             ze3t_b = e3t(ji,jj,jk,Kbb)
             ze3t_n = e3t(ji,jj,jk,Kmm)
@@ -292 +294 @@
             IF( ll_traqsr .AND. jn == jp_tem .AND. jk <= nksr )                            &
                &     ztc_f  = ztc_f  - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) )
-               !
+            !
             !
             IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )                                          &

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traqsr.F90

@@ -244 +244 @@
       ENDIF
       !
-!!st      IF( l_trdtra ) THEN     ! qsr tracers trends saved for diagnostics
-!!st         ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs) - ztrdt(:,:,:)
-!!st         CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_qsr, ztrdt )
-!!st         DEALLOCATE( ztrdt )
-!!st      ENDIF
       !                       ! print mean trends (used for debugging)
       IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' qsr  - Ta: ', mask1=tmask, clinfo3='tra-ta' )
@@ -308 +303 @@
       ENDIF
       !
-      DO_2D( 0, 0, 0, 0 )                          ! pre-calculated expensive coefficient
+       DO_2D( 0, 0, 0, 0 )                          ! pre-calculated expensive coefficient
          zlogc = LOG(  MAX( 0.03_wp, MIN( sf_chl(1)%fnow(ji,jj,1) ,10._wp ) )  ) ! zlogc = log(zchl)   with 0.03 <= Chl >= 10. 
          zc1   = 0.113328685307 + 0.803 * zlogc                               ! zc1 : log(zCze)  = log (1.12  * zchl**0.803)
@@ -371 +366 @@
             zeT(ji,jj) = zzeT                                   ! total          -        -      -
          END_2D
-!!stbug         IF( jk == 1 ) THEN                        !- sea-ice : store the 1st level attenuation coefficient
-!!stbug            WHERE( qsr(A2D(0)) /= 0._wp )   ;   fraqsr_1lev(A2D(0)) = 1._wp - zeT(A2D(0)) / qsr(A2D(0))
-!!stbug            ELSEWHERE                       ;   fraqsr_1lev(A2D(0)) = 1._wp
-!!stbug            END WHERE
-!!stbug         ENDIF
+         !
       END DO
       !