Changeset 15231 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diahth.F90

Timestamp:

2021-09-08T09:58:57+02:00 (3 years ago)

Author:

clem

Message:

4.0-HEAD: small bug fixes following tickets #2644 #2679 #2688

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diahth.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diahth.F90

@@ -365 +365 @@
       !
       ilevel(:,:) = 1
-      DO jk = 2, jpkm1
+      DO jk = 1, jpkm1
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF( ( gdept_n(ji,jj,jk) < pdep ) .AND. ( tmask(ji,jj,jk) == 1 ) ) THEN
-                   ilevel(ji,jj) = jk
-                   zthick(ji,jj) = zthick(ji,jj) + e3t_n(ji,jj,jk)
-                   phtc  (ji,jj) = phtc  (ji,jj) + e3t_n(ji,jj,jk) * ptn(ji,jj,jk)
+               IF( ( gdepw_n(ji,jj,jk+1) < pdep ) .AND. ( tmask(ji,jj,jk) == 1 ) ) THEN
+                  ilevel(ji,jj) = jk+1
+                  zthick(ji,jj) = zthick(ji,jj) + e3t_n(ji,jj,jk)
+                  phtc  (ji,jj) = phtc  (ji,jj) + e3t_n(ji,jj,jk) * ptn(ji,jj,jk)
                ENDIF
             ENDDO
@@ -380 +380 @@
          DO ji = 1, jpi
             ik = ilevel(ji,jj)
-            zthick(ji,jj) = pdep - zthick(ji,jj)   !   remaining thickness to reach depht pdep
-            phtc(ji,jj)   = phtc(ji,jj) + ptn(ji,jj,ik+1) * MIN( e3t_n(ji,jj,ik+1), zthick(ji,jj) ) &
-                                                          * tmask(ji,jj,ik+1)
+            IF( tmask(ji,jj,ik) == 1 ) THEN
+               zthick(ji,jj) = MIN ( gdepw_n(ji,jj,ik+1), pdep ) - zthick(ji,jj)   ! remaining thickness to reach dephw pdep
+               phtc(ji,jj)   = phtc(ji,jj) + ptn(ji,jj,ik) * zthick(ji,jj)
+            ENDIF
          END DO
       ENDDO