Changeset 6605

Timestamp:

2016-05-23T16:16:30+02:00 (8 years ago)

Author:

drew

Message:

Working version of sshwzv, but not necessarily the final version. Cycles.

Location:

branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/sshwzv.F90 (modified) (2 diffs)
• TRA/trasbc.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -75 +75 @@
       INTEGER, INTENT(in) ::   kt                      ! time step
       ! 
-      INTEGER             ::   jk                      ! dummy loop indice
+      INTEGER             ::   ji, jj, jk   ! dummy loop indices
       REAL(wp)            ::   z2dt, z1_rau0           ! local scalars
       !!----------------------------------------------------------------------
@@ -103 +103 @@
 #if defined key_vvl
 ! Don't directly adjust ssh but change hdivn at all levels instead
-! In trasbc also add in the heat and salt content associated with these changes at each level
+! In trasbc also add in the heat and salt content associated with these changes at each level  
+        call lbc_lnk( ssh_iau, 'T', 1.0) 
         DO jk = 1, jpkm1                                 
-          hdivn(:,:,jk) = hdivn(:,:,jk) - ( ssh_iau(:,:) / fse3t_n(:,:,jk) ) * ( e3t_0(:,:,jk) / ht_0(:,:) ) * tmask(:,:,jk) 
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                 hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - ( ssh_iau(ji,jj) / ( ht_0(ji,jj) + 1.0 - tmask(ji,jj,jk) ) ) * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) * tmask(ji,jj,jk) 
+               END DO
+            END DO
         END DO
+        CALL lbc_lnk( hdivn, 'T', 1. ) ! Not sure that's necessary
       ENDIF
 #endif

branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -33 +33 @@
    USE timing          ! Timing
    USE eosbn2
-#if defined key_asminc   
-   USE asminc          ! Assimilation increment
-#endif
 
    IMPLICIT NONE
@@ -290 +287 @@
          END DO  
       ENDIF
-
-#if defined key_asminc
-! WARNING: THIS MAY WELL NOT BE REQUIRED - WE DON'T WANT TO CHANGE T&S BUT THIS MAY COMPENSATE ANOTHER TERM...
-! Rate of change in e3t for each level is ssh_iau*e3t_0/ht_0
-! Contribution to tsa should be rate of change in level / per m of ocean? (hence the division by fse3t_n)
-      IF( ln_sshinc ) THEN         ! input of heat and salt due to assimilation
-         DO jj = 2, jpj 
-            DO ji = fs_2, fs_jpim1
-               zdep = ssh_iau(ji,jj) / ht_0(ji,jj)
-               DO jk = 1, jpkm1
-                  tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem)   &
-                                        &            * ( 1.0 + zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) )
-                  tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal)   &
-                                        &            * ( 1.0 + zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) )
-               END DO
-            END DO  
-         END DO  
-      ENDIF
-#endif
  
       IF( l_trdtra )   THEN                      ! send trends for further diagnostics