Changeset 12068 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfhdiv.F90

Timestamp:

2019-12-05T13:18:21+01:00 (4 years ago)

Author:

davestorkey

Message:

2019/UKMO_MERGE_2019 : Merging in changes from ENHANCE-02_ISF_nemo.

Location:

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF

Files:

• . (copied) (copied from NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/ISF)
• isfhdiv.F90 (modified) (6 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfhdiv.F90

@@ -15 +15 @@
 CONTAINS
 
-   SUBROUTINE isf_hdiv( kt, phdiv )
+   SUBROUTINE isf_hdiv( kt, Kmm, phdiv )
       !!----------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_hdiv  ***
@@ -27 +27 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) :: kt
+      INTEGER, INTENT(in) :: Kmm      !  ocean time level index
       !
       IF ( ln_isf ) THEN
@@ -40 +41 @@
             !
             ! correct divergence only for the first time step
-            IF ( kt == nit000   ) CALL isf_hdiv_cpl(risfcpl_vol       , phdiv)
-            IF ( kt == nit000+1 ) CALL isf_hdiv_cpl(risfcpl_vol*0.5_wp, phdiv)
+            IF ( kt == nit000   ) CALL isf_hdiv_cpl(Kmm, risfcpl_vol       , phdiv)
+            IF ( kt == nit000+1 ) CALL isf_hdiv_cpl(Kmm, risfcpl_vol*0.5_wp, phdiv)
             !
             ! correct divergence every time step to remove any trend due to coupling
             ! conservation option
-            IF ( ln_isfcpl_cons ) CALL isf_hdiv_cpl(risfcpl_cons_vol, phdiv)
+            IF ( ln_isfcpl_cons ) CALL isf_hdiv_cpl(Kmm, risfcpl_cons_vol, phdiv)
             !
          END IF
@@ -96 +97 @@
    END SUBROUTINE isf_hdiv_mlt
 
-   SUBROUTINE isf_hdiv_cpl(pqvol, phdiv)
+   SUBROUTINE isf_hdiv_cpl(Kmm, pqvol, phdiv)
       !!----------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_hdiv_cpl  ***
@@ -111 +112 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: phdiv
       !!----------------------------------------------------------------------
+      INTEGER,                          INTENT(in)    :: Kmm     ! ocean time level index
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in   ) :: pqvol
       !!----------------------------------------------------------------------
@@ -117 +119 @@
       !
       DO jk=1,jpk 
-         phdiv(:,:,jk) =  phdiv(:,:,jk) + pqvol(:,:,jk) * r1_e1e2t(:,:) / e3t_n(:,:,jk)
+         phdiv(:,:,jk) =  phdiv(:,:,jk) + pqvol(:,:,jk) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
       END DO
       !