Changeset 11094

Timestamp:

2019-06-11T14:58:51+02:00 (6 years ago)

Author:

agn

Message:

complete merge of diahth.F90

File:

• NEMO/releases/release-4.0/src/OCE/DIA/diahth.F90 (modified) (7 diffs)

NEMO/releases/release-4.0/src/OCE/DIA/diahth.F90

@@ -89 +89 @@
      REAL(wp), DIMENSION(jpi,jpj) ::   zhtc3   !: heat content of first 300 m                    [W]
 
-<<<<<<< variant A
      IF (iom_use("mlddzt").OR.iom_use("mldr0_3").OR.iom_use("mldr0_1")) THEN
         ! ------------------------------------------------------------- !
@@ -99 +98 @@
         zmaxdzT(:,:) = 0._wp
         IF( nla10 > 1 ) THEN
->>>>>>> variant B
-     IF(iom_use("mlddzt").OR.iom_use("mldr0_3").OR.iom_use("mldr0_1").OR.iom_use("mld_dt02") &
-          & .OR.iom_use("topthdep").OR.iom_use("mldr10_3").OR.iom_use("pycndep").OR.iom_use("tinv").OR.iom_use("depti")) THEN
-        ! initialization
-        ztinv  (:,:) = 0._wp  
-        zdepinv(:,:) = 0._wp  
-        zmaxdzT(:,:) = 0._wp  
-        DO jj = 1, jpj
-           DO ji = 1, jpi
-              zztmp = gdepw_n(ji,jj,mbkt(ji,jj)+1) 
-              zhth     (ji,jj) = zztmp
-              zabs2   (ji,jj) = zztmp
-              ztm2    (ji,jj) = zztmp
-              zrho10_3(ji,jj) = zztmp
-              zpycn   (ji,jj) = zztmp
-           END DO
-        END DO
-        IF( nla10 > 1 ) THEN 
-======= end
            DO jj = 1, jpj
               DO ji = 1, jpi
@@ -123 +103 @@
                  zrho0_3(ji,jj) = zztmp
                  zrho0_1(ji,jj) = zztmp
-<<<<<<< variant A
                  zhth(ji,jj) = zztmp
->>>>>>> variant B
-======= end
-              END DO
-           END DO
-<<<<<<< variant A
+              END DO
+           END DO
         ELSE IF (iom_use("mlddzt")) THEN
            DO jj = 1, jpj
@@ -139 +115 @@
         ELSE
            zhth(:,:) = 0._wp
->>>>>>> variant B
-======= end
+
         ENDIF
-<<<<<<< variant A
->>>>>>> variant B
-     ENDIF
-======= end
-
-<<<<<<< variant A
->>>>>>> variant B
-     IF (iom_use("mlddzt").OR.iom_use("mldr0_3").OR.iom_use("mldr0_1")) THEN
-        ! ------------------------------------------------------------- !
-        ! thermocline depth: strongest vertical gradient of temperature !
-        ! turbocline depth (mixing layer depth): avt = zavt5            !
-        ! MLD: rho = rho(1) + zrho3                                     !
-        ! MLD: rho = rho(1) + zrho1                                     !
-        ! ------------------------------------------------------------- !
-======= end
+
         DO jk = jpkm1, 2, -1   ! loop from bottom to 2
            DO jj = 1, jpj
@@ -165 +126 @@
                  zzdep = zzdep * tmask(ji,jj,1)
 
-<<<<<<< variant A
                  IF( zztmp > zmaxdzT(ji,jj) ) THEN
->>>>>>> variant B
-                 IF( zztmp > zmaxdzT(ji,jj) ) THEN                        
-======= end
                     zmaxdzT(ji,jj) = zztmp   ;   zhth    (ji,jj) = zzdep                ! max and depth of dT/dz
                  ENDIF
 
-<<<<<<< variant A
                  IF( nla10 > 1 ) THEN
->>>>>>> variant B
-                 IF( nla10 > 1 ) THEN 
-======= end
                     zztmp = rhop(ji,jj,jk) - rhop(ji,jj,1)                             ! delta rho(1)
                     IF( zztmp > zrho3 )          zrho0_3(ji,jj) = zzdep                ! > 0.03
@@ -188 +141 @@
 
         IF (iom_use("mlddzt")) CALL iom_put( "mlddzt", zhth*tmask(:,:,1) )            ! depth of the thermocline
-<<<<<<< variant A
         IF( nla10 > 1 ) THEN
->>>>>>> variant B
-        IF( nla10 > 1 ) THEN 
-======= end
            IF (iom_use("mldr0_3")) CALL iom_put( "mldr0_3", zrho0_3*tmask(:,:,1) )   ! MLD delta rho(surf) = 0.03
            IF (iom_use("mldr0_1")) CALL iom_put( "mldr0_1", zrho0_1*tmask(:,:,1) )   ! MLD delta rho(surf) = 0.01
@@ -360 +309 @@
      ENDIF
      !
-      IF( ln_timing )   CALL timing_stop('dia_hth')
-     !
    END SUBROUTINE dia_hth