Changeset 285 for trunk/NEMO/OPA_SRC/TRD

Timestamp:

2005-09-22T12:30:35+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_002 : CT : use ln_traldf_iso logical instead of l_traldf_iso one because it should not be dependant of the use or not of the partial steps

File:

• trunk/NEMO/OPA_SRC/TRD/trdmld.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -386 +386 @@
       END DO
 
-      IF( l_traldf_iso ) THEN
+      IF( ln_traldf_iso ) THEN
          ! We substract to the TOTAL vertical diffusion tmltrd(:,:,jpmldzdf) 
          ! computed in subroutines trazdf_iso.F90 or trazdf_imp.F90
@@ -396 +396 @@
 
       ! Boundary conditions
-      DO jk = 1, jpltrd
-         CALL lbc_lnk( tmltrd, 'T', 1. )
-         CALL lbc_lnk( smltrd, 'T', 1. )
-      END DO
+      CALL lbc_lnk( tmltrd, 'T', 1. )
+      CALL lbc_lnk( smltrd, 'T', 1. )
 
       IF( idebug /= 0 ) THEN
@@ -581 +579 @@
          CALL histwrite( nidtrd,"somlbtdz",it,tmltrd(:,:, 6),ndimtrd1,ndextrd1) ! vert. diffusion 
          CALL histwrite( nidtrd,"somlbtdt",it,ztmlres       ,ndimtrd1,ndextrd1) ! dh/dt entrainment (residual)
-         IF( l_traldf_iso ) THEN
+         IF( ln_traldf_iso ) THEN
             CALL histwrite( nidtrd,"somlbtdv",it,tmltrd(:,:, 7),ndimtrd1,ndextrd1) ! vert. lateral diff.
          ENDIF
@@ -603 +601 @@
          CALL histwrite( nidtrd,"somlbsdz",it,smltrd(:,:, 6),ndimtrd1,ndextrd1) ! vert. diff.
          CALL histwrite( nidtrd,"somlbsdt",it,zsmlres       ,ndimtrd1,ndextrd1) ! dh/dt entrainment (residual)
-         IF( l_traldf_iso ) THEN
+         IF( ln_traldf_iso ) THEN
             CALL histwrite( nidtrd,"somlbsdv",it,smltrd(:,:, 7),ndimtrd1,ndextrd1) ! vert. lateral diff;
          ENDIF
@@ -793 +791 @@
       CALL histdef( nidtrd, "somlbtdt", clmxl//"T dh/dt Entrainment (Residual)", "C/s",   & ! T * dh/dt 
          &          jpi, jpj, nh_t, 1  , 1, 1  , -99 , 32, clop, zout, zout )
-      IF( l_traldf_iso ) THEN
+      IF( ln_traldf_iso ) THEN
       CALL histdef( nidtrd, "somlbtdv", clmxl//"T Vert. lateral Diffusion","C/s",   & ! vertical diffusion entrainment (ISO)
          &          jpi, jpj, nh_t, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
@@ -828 +826 @@
       CALL histdef( nidtrd, "somlbsdt", clmxl//"S dh/dt Entrainment (Residual)", "PSU/s",   & ! S * dh/dt 
          &          jpi, jpj, nh_t, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
-      IF( l_traldf_iso ) THEN
+      IF( ln_traldf_iso ) THEN
       ! vertical diffusion entrainment (ISO)
       CALL histdef( nidtrd, "somlbsdv", clmxl//"S Vertical lateral Diffusion", "PSU/s",   & ! vert. lat. diff.