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

Timestamp:

2017-11-23T13:41:43+01:00 (6 years ago)

Author:

charris

Message:

Changes to correctly deal with sea surface height increments both with and without vvl.

File:

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

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

@@ -27 +27 @@
    USE trd_oce        ! trends: ocean variables
    USE trdtra         ! trends manager: tracers 
+#if defined key_asminc   
+   USE asminc         ! Assimilation increment
+#endif
    !
    USE in_out_manager ! I/O manager
@@ -208 +211 @@
       IF( iom_use('rnf_x_sss') )   CALL iom_put( "rnf_x_sss", rnf*tsn(:,:,1,jp_sal) )   ! runoff term on sss
 
+#if defined key_asminc
+      !
+      !----------------------------------------
+      !        Assmilation effects
+      !----------------------------------------
+      !
+      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 
+            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
+               END DO  
+            END DO  
+         ENDIF
+         !
+      ENDIF
+#endif
+
       !
       !----------------------------------------