Changeset 8829 for branches/2017/dev_r8789_sbc/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2017-11-28T10:50:49+01:00 (6 years ago)

Author:

charris

Message:

First set of modifications following (p)review.

File:

• branches/2017/dev_r8789_sbc/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (3 diffs)

branches/2017/dev_r8789_sbc/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -75 +75 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
-      INTEGER  ::   ji, jj, jk, jn        ! dummy loop indices  
-      INTEGER  ::   ikt, ikb              ! local integers
-      REAL(wp) ::   zfact, z1_e3t, zdep   ! local scalar
+      INTEGER  ::   ji, jj, jk, jn              ! dummy loop indices  
+      INTEGER  ::   ikt, ikb                    ! local integers
+      REAL(wp) ::   zfact, z1_e3t, zdep, ztim   ! local scalar
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdt, ztrds
       !!----------------------------------------------------------------------
@@ -219 +219 @@
       IF( ln_sshinc ) THEN         ! input of heat and salt due to assimilation
           !
-         ! Only required for vvl case (without vvl all the ssh increment is added to the surface layer and because the extra
-         ! water added by assimilation is always assumed to have the same T/S as the layer it is added to, and no additional T/S 
-         ! content is explicitly added into qns/sfx due to ssh_iau, there is no need to include a compensating term to adjust 
-         ! for it here)
-         !
-         IF( .NOT. ln_linssh ) THEN 
+         IF( ln_linssh ) THEN 
             DO jj = 2, jpj 
                DO ji = fs_2, fs_jpim1
-                  zdep = ssh_iau(ji,jj) / ( ht_0(ji,jj) + 1.0 - ssmask(ji, jj) )
-                  DO jk = 1, jpkm1
-                     tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem)   &
-                                           &            + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / e3t_n(ji,jj,jk) )
-                     tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal)   &
-                                           &            + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / e3t_n(ji,jj,jk) )
-                  END DO
+                  ztim = ssh_iau(ji,jj) / e3t_n(ji,jj,1)
+                  tsa(ji,jj,1,jp_tem) = tsa(ji,jj,1,jp_tem) + tsn(ji,jj,1,jp_tem) * ztim
+                  tsa(ji,jj,1,jp_sal) = tsa(ji,jj,1,jp_sal) + tsn(ji,jj,1,jp_sal) * ztim
+               END DO
+            END DO
+         ELSE
+            DO jj = 2, jpj 
+               DO ji = fs_2, fs_jpim1
+                  ztim = ssh_iau(ji,jj) / ( ht_n(ji,jj) + 1. - ssmask(ji, jj) )
+                  tsa(ji,jj,:,jp_tem) = tsa(ji,jj,:,jp_tem) + tsn(ji,jj,:,jp_tem) * ztim
+                  tsa(ji,jj,:,jp_sal) = tsa(ji,jj,:,jp_sal) + tsn(ji,jj,:,jp_sal) * ztim
                END DO  
             END DO  
@@ -239 +238 @@
          !
       ENDIF
+      !
 #endif