Changeset 1111 for trunk/NEMO/OPA_SRC/TRA/tranpc.F90

Timestamp:

2008-06-13T16:35:46+02:00 (16 years ago)

Author:

ctlod

Message:

trunk: remove a small bug related to the non-penetrative convective adjustment scheme, see ticket: #203

File:

• trunk/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/TRA/tranpc.F90

@@ -11 +11 @@
    !!                                       suppression of common work arrays
    !!            8.5  !  02-06  (G. Madec)  free form F90
+   !!            9.0  !  08-06  (G. Madec)  applied on ta, sa and called before tranxt in step.F90
    !!----------------------------------------------------------------------
 
@@ -38 +39 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Id:$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -49 +50 @@
       !!
       !! ** Purpose :   Non penetrative convective adjustment scheme. solve 
-      !!      the static instability of the water column (now, after the swap) 
+      !!      the static instability of the water column on after fields
       !!      while conserving heat and salt contents.
       !!
@@ -57 +58 @@
       !!      l_trdtra=T: the trend associated with this algorithm is saved.
       !!
-      !! ** Action  : - (tn,sn) after the application od the npc scheme
+      !! ** Action  : - (ta,sa) after the application od the npc scheme
       !!              - save the associated trends (ttrd,strd) ('key_trdtra')
       !!
@@ -84 +85 @@
          inpci = 0
 
-         CALL eos( tn, sn, rhd, zrhop )         ! Potential density
-
-
-         IF( l_trdtra )   THEN                  ! Save tn and sn trends
-            ztrdt(:,:,:) = tn(:,:,:) 
-            ztrds(:,:,:) = sn(:,:,:) 
+         CALL eos( ta, sa, rhd, zrhop )         ! Potential density
+
+
+         IF( l_trdtra )   THEN                  ! Save ta and sa trends
+            ztrdt(:,:,:) = ta(:,:,:) 
+            ztrds(:,:,:) = sa(:,:,:) 
          ENDIF
 
@@ -160 +161 @@
                         !
                         ze3tot= fse3t(ji,jj,ikup)
-                        zta   = tn   (ji,jj,ikup)
-                        zsa   = sn   (ji,jj,ikup)
+                        zta   = ta   (ji,jj,ikup)
+                        zsa   = sa   (ji,jj,ikup)
                         zraua = zrhop(ji,jj,ikup)
                         !
@@ -171 +172 @@
                            ze3dwn =  fse3t(ji,jj,jkdown)
                            ze3tot =  ze3tot + ze3dwn
-                           zta   = ( zta*(ze3tot-ze3dwn) + tn(ji,jj,jkdown)*ze3dwn )/ze3tot
-                           zsa   = ( zsa*(ze3tot-ze3dwn) + sn(ji,jj,jkdown)*ze3dwn )/ze3tot
+                           zta   = ( zta*(ze3tot-ze3dwn) + ta(ji,jj,jkdown)*ze3dwn )/ze3tot
+                           zsa   = ( zsa*(ze3tot-ze3dwn) + sa(ji,jj,jkdown)*ze3dwn )/ze3tot
                            zraua = ( zraua*(ze3tot-ze3dwn) + zrhop(ji,jj,jkdown)*ze3dwn )/ze3tot
                            inpci = inpci+1
@@ -180 +181 @@
                         !
                         DO jkp = ikup, ikdown-1
-                           tn(ji,jj,jkp) = zta
-                           sn(ji,jj,jkp) = zsa
+                           ta(ji,jj,jkp) = zta
+                           sa(ji,jj,jkp) = zsa
                            zrhop(ji,jj,jkp) = zraua
                         END DO
                         IF (ikdown == ikbot-1 .AND. zraua >= zrhop(ji,jj,ikdown) ) THEN
-                           tn(ji,jj,ikdown) = zta
-                           sn(ji,jj,ikdown) = zsa
+                           ta(ji,jj,ikdown) = zta
+                           sa(ji,jj,ikdown) = zsa
                            zrhop(ji,jj,ikdown) = zraua
                         ENDIF
@@ -200 +201 @@
          ! 
          IF( l_trdtra )   THEN         ! save the Non penetrative mixing trends for diagnostic
-            ztrdt(:,:,:) = tn(:,:,:) - ztrdt(:,:,:)
-            ztrds(:,:,:) = sn(:,:,:) - ztrds(:,:,:)
+            ztrdt(:,:,:) = ta(:,:,:) - ztrdt(:,:,:)
+            ztrds(:,:,:) = sa(:,:,:) - ztrds(:,:,:)
             CALL trd_mod(ztrdt, ztrds, jptra_trd_npc, 'TRA', kt)
          ENDIF
       
-         ! Lateral boundary conditions on ( tn, sn )   ( Unchanged sign)
+         ! Lateral boundary conditions on ( ta, sa )   ( Unchanged sign)
          ! ------------------------------============
-         CALL lbc_lnk( tn, 'T', 1. )
-         CALL lbc_lnk( sn, 'T', 1. )
+         CALL lbc_lnk( ta, 'T', 1. )
+         CALL lbc_lnk( sa, 'T', 1. )