Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/TOP/trcdta.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/TOP/trcdta.F90 (modified) (4 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/TOP/trcdta.F90

@@ -189 +189 @@
          ptrcdta(:,:,:) = sf_trcdta(kjl)%fnow(:,:,:) * tmask(:,:,:)
          ! 
+#if ! defined key_sed_off
          IF( ln_sco ) THEN                !== s- or mixed s-zps-coordinate  ==!
             !
@@ -195 +196 @@
                WRITE(numout,*) 'trc_dta: interpolates passive tracer data onto the s- or mixed s-z-coordinate mesh'
             ENDIF
-            DO_2D( 1, 1, 1, 1 )                 ! vertical interpolation of T & S
+            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )                 ! vertical interpolation of T & S
                DO jk = 1, jpk                        ! determines the intepolated T-S profiles at each (i,j) points
                   zl = gdept_0(ji,jj,jk)
@@ -220 +221 @@
             ! zps-coordinate (partial steps) interpolation at the last ocean level
             IF( ln_zps ) THEN
-                DO_2D( 1, 1, 1, 1 )
+                DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
                    ik = mbkt(ji,jj)
-                   IF( ik > 1 ) THEN
+                   IF( ik > 1 .AND. gdept_0(ji,jj,ik) < gdept_1d(ik) ) THEN
                       zl = ( gdept_1d(ik) - gdept_0(ji,jj,ik) ) / ( gdept_1d(ik) - gdept_1d(ik-1) )
                       ptrcdta(ji,jj,ik) = (1.-zl) * ptrcdta(ji,jj,ik) + zl * ptrcdta(ji,jj,ik-1)
@@ -235 +236 @@
             !
          ENDIF
+#endif
          ! Scale by multiplicative factor
          ptrcdta(:,:,:) = ptrcdta(:,:,:) * rf_trfac(kjl)

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+