Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/DIA/diahth.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/OCE/DIA/diahth.F90 (modified) (2 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/OCE/DIA/diahth.F90

@@ -334 +334 @@
    SUBROUTINE dia_hth_htc( Kmm, pdep, pt, phtc )
       !
-      INTEGER , INTENT(in) :: Kmm      ! ocean time level index
-      REAL(wp), INTENT(in) :: pdep     ! depth over the heat content
-      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in) :: pt   
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: phtc  
-      !
-      INTEGER  :: ji, jj, jk, ik
-      REAL(wp), DIMENSION(jpi,jpj) :: zthick
-      INTEGER , DIMENSION(jpi,jpj) :: ilevel
+      INTEGER , INTENT(in) ::   Kmm      ! ocean time level index
+      REAL(wp), INTENT(in) ::   pdep     ! depth over the heat content
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in)    ::   pt   
+      REAL(wp), DIMENSION(jpi,jpj),     INTENT(inout) ::   phtc  
+      !
+      INTEGER  ::   ji, jj, jk, ik
+      REAL(wp), DIMENSION(jpi,jpj) ::   zthick
+      INTEGER , DIMENSION(jpi,jpj) ::   ilevel
 
 
       ! surface boundary condition
       
-      IF( .NOT. ln_linssh ) THEN   ;   zthick(:,:) = 0._wp       ;   phtc(:,:) = 0._wp                                   
+      IF( .NOT. ln_linssh ) THEN   ;   zthick(:,:) = 0._wp          ;   phtc(:,:) = 0._wp                                   
       ELSE                         ;   zthick(:,:) = ssh(:,:,Kmm)   ;   phtc(:,:) = pt(:,:,1) * ssh(:,:,Kmm) * tmask(:,:,1)   
       ENDIF
       !
       ilevel(:,:) = 1
-      DO_3D( 1, 1, 1, 1, 2, jpkm1 )
-         IF( ( gdept(ji,jj,jk,Kmm) < pdep ) .AND. ( tmask(ji,jj,jk) == 1 ) ) THEN
-             ilevel(ji,jj) = jk
+      DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+         IF( ( gdepw(ji,jj,jk+1,Kmm) < pdep ) .AND. ( tmask(ji,jj,jk) == 1 ) ) THEN
+             ilevel(ji,jj) = jk+1
              zthick(ji,jj) = zthick(ji,jj) + e3t(ji,jj,jk,Kmm)
              phtc  (ji,jj) = phtc  (ji,jj) + e3t(ji,jj,jk,Kmm) * pt(ji,jj,jk)
@@ -361 +361 @@
       DO_2D( 1, 1, 1, 1 )
          ik = ilevel(ji,jj)
-         zthick(ji,jj) = pdep - zthick(ji,jj)   !   remaining thickness to reach depht pdep
-         phtc(ji,jj)   = phtc(ji,jj)    &
-            &           + pt (ji,jj,ik+1) * MIN( e3t(ji,jj,ik+1,Kmm), zthick(ji,jj) ) &
-                                                       * tmask(ji,jj,ik+1)
+         IF( tmask(ji,jj,ik) == 1 ) THEN
+            zthick(ji,jj) = MIN ( gdepw(ji,jj,ik+1,Kmm), pdep ) - zthick(ji,jj)   ! remaining thickness to reach dephw pdep
+            phtc(ji,jj)   = phtc(ji,jj) + pt(ji,jj,ik) * zthick(ji,jj)
+         ENDIF
       END_2D
-      !
       !
    END SUBROUTINE dia_hth_htc

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