Changeset 1486

Timestamp:

2009-07-07T12:09:51+02:00 (15 years ago)

Author:

smasson

Message:

additional bug fix associated with changeset:1485, see ticket:468

File:

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

trunk/NEMO/OPA_SRC/DIA/diahth.F90

@@ -101 +101 @@
       ! ----------------------- !
       
-      ! search last level above 20C
-      ikc(:,:) = COUNT( tn >= 20., dim = 3 )
+      ! search last level above 20C (beware temperature is not always decreasing with depth)
+      ikc(:,:) = MAXLOC( fsdept(:,:,1:jpkm1), mask = tn(:,:,1:jpkm1) >= 20., dim = 3 )   !   ikc = 0 if mask always equal to false
       ! Depth of 20C isotherm, linear interpolation
       DO jj = 1, jpj
          DO ji = 1, jpi
-            iid = MAX(1, ikc(ji,jj))
+            iid = MAX( 1, ikc(ji,jj) )    ! make sure that iid /= 0 (these points are masked later)
             zd = fsdept(ji,jj,iid) + (    fsdept(ji,jj,iid+1) - fsdept(ji,jj,iid)                           )   &
                &                   * ( 20.*tmask(ji,jj,iid+1) -     tn(ji,jj,iid)                           )   &
@@ -115 +115 @@
          END DO
       END DO
-      WHERE(ikc == 0 )   hd20 = 0.e0
+      WHERE(ikc == 0 )   hd20 = 0.e0      ! set to 0 points where tn is always < 20 (not very good for temporal mean...)
       CALL iom_put( "20d", hd20 )         ! depth of the 20 isotherm
 
@@ -122 +122 @@
       ! ----------------------- !
       
-      ! search last level above 28C
-      ikc(:,:) = COUNT( tn >= 28., dim = 3 )
+      ! search last level above 28C (beware temperature is not always decreasing with depth)
+      ikc(:,:) = MAXLOC( fsdept(:,:,1:jpkm1), mask = tn(:,:,1:jpkm1) >= 28., dim = 3 )   !   ikc = 0 if mask always equal to false
       ! Depth of 28C isotherm, linear interpolation
       DO jj = 1, jpj
          DO ji = 1, jpi
-            iid = MAX(1, ikc(ji,jj))
+            iid = MAX( 1, ikc(ji,jj) )    ! make sure that iid /= 0 (these points are masked later)
             zd = fsdept(ji,jj,iid) + (    fsdept(ji,jj,iid+1) - fsdept(ji,jj,iid)                           )   &
                &                   * ( 28.*tmask(ji,jj,iid+1) -     tn(ji,jj,iid)                           )   &
@@ -136 +136 @@
          END DO
       END DO
-      WHERE(ikc == 0 )   hd28 = 0.e0
+      WHERE(ikc == 0 )   hd28 = 0.e0      ! set to 0 points where tn is always < 28 (not very good for temporal mean...)
       CALL iom_put( "28d", hd28 )         ! depth of the 28 isotherm
 
@@ -146 +146 @@
       ilevel = 0
       zthick_0 = 0.e0
-      DO jk = 1, jpk-1                        
+      DO jk = 1, jpkm1                      
          zthick_0 = zthick_0 + e3t_0(jk)
          IF( zthick_0 < 300. )   ilevel = jk