Changeset 1484

Timestamp:

2009-07-06T14:22:44+02:00 (16 years ago)

Author:

smasson

Message:

bugfix in 300m heat contain, see ticket:342

File:

• trunk/NEMO/OPA_SRC/DIA/diahth.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DIA/diahth.F90

@@ -69 +69 @@
       INTEGER, DIMENSION(jpi,jpj) ::   ikc
 
-      REAL(wp) :: zd, zmoy              ! temporary scalars
+      REAL(wp) :: zd, zmoy, zthick_0, zcoef              ! temporary scalars
       REAL(wp), DIMENSION(jpi) ::   zmax
+      REAL(wp), DIMENSION(jpi,jpj) ::   zthick
       REAL(wp), DIMENSION(jpi,jpk) ::   zdzt
       !!----------------------------------------------------------------------
@@ -198 +199 @@
       ! ----------------------------------------- !
 
-      htc3(:,:) = 0.e0
-      ilevel = 18
-      zmoy = rau0 * rcp * 0.5
-      
-      ! intregrate tn from surface to klevel
-
+      ! find ilevel with (ilevel+1) the deepest W-level above 300m (we assume we can use e3t_0 to do this search...)
+      ilevel = 0
+      zthick_0 = 0.e0
+      DO jk = 1, jpk-1                        
+         zthick_0 = zthick_0 + e3t_0(jk)
+         IF( zthick_0 < 300. )   ilevel = jk
+      END DO
+      ! surface boundary condition
+      IF( lk_vvl ) THEN   ;   zthick(:,:) = 0.e0        ;   htc3(:,:) = 0.e0                                     
+      ELSE                ;   zthick(:,:) = sshn(:,:)   ;   htc3(:,:) = tn(:,:,jk) * sshn(:,:) * tmask(:,:,jk)   
+      ENDIF
+      ! integration down to ilevel
       DO jk = 1, ilevel
-               htc3(:,:) = htc3(:,:)   &
-                         + zmoy * ( tn(:,:,jk) + tn(:,:,jk+1) ) * fse3w(:,:,jk) * tmask(:,:,jk)
-      END DO
+         zthick(:,:) = zthick(:,:) + fse3t(:,:,jk)
+         htc3  (:,:) = htc3  (:,:) + fse3t(:,:,jk) * tn(:,:,jk) * tmask(:,:,jk)
+      END DO
+      ! deepest layer
+      zthick(:,:) = 300. - zthick(:,:)   !   remaining thickness to reach 300m
+      htc3(:,:) = htc3(:,:) + tn(:,:,ilevel+1) * MIN( fse3t(:,:,ilevel+1), zthick(:,:) ) * tmask(:,:,ilevel+1)
+      ! from temperature to heat contain
+      zcoef = rau0 * rcp
+      htc3(:,:) = zcoef * htc3(:,:)
       CALL iom_put( "hc300", htc3 )   ! first 300m heaat content