Changeset 12068 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isfpar.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)
• isfpar.F90 (modified) (4 diffs)

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

@@ -43 +43 @@
 CONTAINS
  
-   SUBROUTINE isf_par( kt, ptsc, pqfwf )
+   SUBROUTINE isf_par( kt, Kmm, ptsc, pqfwf )
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE isf_par ***      
@@ -54 +54 @@
       REAL(wp), DIMENSION(jpi,jpj,jpts), INTENT(inout) :: ptsc
       !!-------------------------- IN  --------------------------------------
-      INTEGER, INTENT(in) ::   kt                                           ! ocean time step
+      INTEGER, INTENT(in) ::   kt                                     ! ocean time step
+      INTEGER, INTENT(in) ::   Kmm                                    ! ocean time level index
       !!---------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj) :: zqoce, zqhc, zqlat, zqh
@@ -60 +61 @@
       !
       ! compute heat content, latent heat and melt fluxes (2d)
-      CALL isfpar_mlt( kt, zqhc, zqoce, pqfwf  )
+      CALL isfpar_mlt( kt, Kmm, zqhc, zqoce, pqfwf  )
       !
       ! compute heat and water flux ( > 0 out )
@@ -77 +78 @@
       !
       ! output fluxes
-      CALL isf_diags_flx( misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, 'par', pqfwf, zqoce, zqlat, zqhc)
+      CALL isf_diags_flx( Kmm, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, 'par', pqfwf, zqoce, zqlat, zqhc)
       !
       ! set temperature content