Changeset 2128 for branches/devukmo2010/NEMO/OPA_SRC/TRA/tradmp.F90

Timestamp:

2010-09-28T14:29:51+02:00 (14 years ago)

Author:

rfurner

Message:

merged branches OBS, ASM, Rivers, BDY & mixed_dynldf ready for vn3.3 merge

File:

• branches/devukmo2010/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) (6 diffs)

branches/devukmo2010/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -47 +47 @@
    LOGICAL, PUBLIC            ::   lk_tradmp = .TRUE.     !: internal damping flag
 #endif
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   strdmp   !: damping salinity trend (psu/s)
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   ttrdmp   !: damping temperature trend (Centigrade/s)
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   resto    !: restoring coeff. on T and S (s-1)
    
@@ -91 +93 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !!
+      REAL(wp) ::   zta, zsa       ! temporary scalars
       INTEGER ::   ji, jj, jk   ! dummy loop indices
       !!----------------------------------------------------------------------
@@ -107 +110 @@
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  ta(ji,jj,jk) = ta(ji,jj,jk) + resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
-                  sa(ji,jj,jk) = sa(ji,jj,jk) + resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                  zta = resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
+                  zsa = resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                  ! add the trends to the general tracer trends
+                  ta(ji,jj,jk) = ta(ji,jj,jk) + zta
+                  sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
+                  ! save the salinity trend (used in asmtrj)
+                  strdmp(ji,jj,jk) = zsa
+                  ttrdmp(ji,jj,jk) = zta
                END DO
             END DO
@@ -118 +127 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   IF( avt(ji,jj,jk) <= 5.e-4 ) THEN
-                     ta(ji,jj,jk) = ta(ji,jj,jk) + resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
-                     sa(ji,jj,jk) = sa(ji,jj,jk) + resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                     zta = resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
+                     zsa = resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                  ELSE
+                     zta = 0.e0
+                     zsa = 0.e0   
                   ENDIF
+                  ! add the trends to the general tracer trends
+                  ta(ji,jj,jk) = ta(ji,jj,jk) + zta
+                  sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
+                  ! save the salinity trend (used in asmtrj)
+                  strdmp(ji,jj,jk) = zsa
+                  ttrdmp(ji,jj,jk) = zta
                END DO
             END DO
@@ -130 +148 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   IF( fsdept(ji,jj,jk) >= hmlp (ji,jj) ) THEN
-                     ta(ji,jj,jk) = ta(ji,jj,jk) + resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
-                     sa(ji,jj,jk) = sa(ji,jj,jk) + resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                     zta = resto(ji,jj,jk) * ( t_dta(ji,jj,jk) - tb(ji,jj,jk) )
+                     zsa = resto(ji,jj,jk) * ( s_dta(ji,jj,jk) - sb(ji,jj,jk) )
+                  ELSE
+                     zta = 0.e0
+                     zsa = 0.e0   
                   ENDIF
+                  ! add the trends to the general tracer trends
+                  ta(ji,jj,jk) = ta(ji,jj,jk) + zta
+                  sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
+                  ! save the salinity trend (used in asmtrj)
+                  strdmp(ji,jj,jk) = zsa
+                  ttrdmp(ji,jj,jk) = zta
                END DO
             END DO
@@ -199 +226 @@
          &   CALL ctl_stop( 'no temperature and/or salinity data define key_dtatem and key_dtasal' )
 
+      strdmp(:,:,:) = 0.e0       ! internal damping salinity trend (used in asmtrj)
+      ttrdmp(:,:,:) = 0.e0
       !                          ! Damping coefficients initialization
       IF( lzoom ) THEN   ;   CALL dtacof_zoom