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

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

@@ -12 +12 @@
 
    USE dom_oce                  ! ocean space and time domain
-   USE oce    , ONLY: tsn       ! ocean dynamics and tracers
+   USE oce    , ONLY: ts        ! ocean dynamics and tracers
    USE phycst , ONLY: rcp, rau0 ! physical constants
    USE eosbn2 , ONLY: eos_fzp   ! equation of state
@@ -39 +39 @@
 ! -------------------------------------------------------------------------------------------------------
 
-  SUBROUTINE isfpar_mlt( kt, pqhc, pqoce, pqfwf )
+  SUBROUTINE isfpar_mlt( kt, Kmm, pqhc, pqoce, pqfwf )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE isfpar_mlt  ***
@@ -54 +54 @@
       !!-------------------------- IN  -------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time step
+      INTEGER, INTENT(in) ::   Kmm  ! ocean time level index
       !!---------------------------------------------------------------------
       !
@@ -59 +60 @@
       SELECT CASE ( cn_isfpar_mlt )
       CASE ( 'spe' )    ! specified runoff in depth (Mathiot et al., 2017 in preparation)
-         CALL isfpar_mlt_spe(kt, pqhc, pqoce, pqfwf)
+         CALL isfpar_mlt_spe(kt, Kmm, pqhc, pqoce, pqfwf)
       CASE ( 'bg03' )    ! Beckmann and Goosse parametrisation 
-         CALL isfpar_mlt_bg03(kt, pqhc, pqoce, pqfwf)
+         CALL isfpar_mlt_bg03(kt, Kmm, pqhc, pqoce, pqfwf)
       CASE ( 'oasis' )
-         CALL isfpar_mlt_oasis( kt, pqhc, pqoce, pqfwf)
+         CALL isfpar_mlt_oasis( kt, Kmm, pqhc, pqoce, pqfwf)
       CASE DEFAULT
          CALL ctl_stop('STOP', 'unknown isf melt formulation : cn_isfpar (should not see this)')
@@ -74 +75 @@
 ! -------------------------------------------------------------------------------------------------------
 
-   SUBROUTINE isfpar_mlt_spe(kt, pqhc, pqoce, pqfwf)
+   SUBROUTINE isfpar_mlt_spe(kt, Kmm, pqhc, pqoce, pqfwf)
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE isfpar_mlt_spe  ***
@@ -85 +86 @@
       !!-------------------------- IN  -------------------------------------
       INTEGER,  INTENT(in) :: kt
+      INTEGER,  INTENT(in) :: Kmm    !  ocean time level index
       !!--------------------------------------------------------------------
       INTEGER :: jk
@@ -97 +99 @@
       ! 1. ------------Mean freezing point
       DO jk = 1,jpk
-         CALL eos_fzp(tsn(:,:,jk,jp_sal), ztfrz3d(:,:,jk), gdept_n(:,:,jk))
+         CALL eos_fzp(ts(:,:,jk,jp_sal,Kmm), ztfrz3d(:,:,jk), gdept(:,:,jk,Kmm))
       END DO
-      CALL isf_tbl(ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
+      CALL isf_tbl(Kmm, ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
       !
       pqfwf(:,:) = - sf_isfpar_fwf(1)%fnow(:,:,1)      ! fresh water flux from the isf (fwfisf <0 mean melting) 
@@ -109 +111 @@
    END SUBROUTINE isfpar_mlt_spe
 
-   SUBROUTINE isfpar_mlt_bg03(kt, pqhc, pqoce, pqfwf)
+   SUBROUTINE isfpar_mlt_bg03(kt, Kmm, pqhc, pqoce, pqfwf)
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE isfpar_mlt_bg03  ***
@@ -128 +130 @@
       !!-------------------------- IN  -------------------------------------
       INTEGER,  INTENT(in) :: kt
+      INTEGER,  INTENT(in) :: Kmm    !  ocean time level index
       !!--------------------------------------------------------------------
       INTEGER :: jk
@@ -137 +140 @@
       ! 0. ------------Mean freezing point
       DO jk = 1,jpk
-         CALL eos_fzp(tsn(:,:,jk,jp_sal), ztfrz3d(:,:,jk), gdept_n(:,:,jk))
+         CALL eos_fzp(ts(:,:,jk,jp_sal,Kmm), ztfrz3d(:,:,jk), gdept(:,:,jk,Kmm))
       END DO
-      CALL isf_tbl(ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
+      CALL isf_tbl(Kmm, ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
       !
       ! 1. ------------Mean temperature
-      CALL isf_tbl(tsn(:,:,jk,jp_tem), ztavg, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
+      CALL isf_tbl(Kmm, ts(:,:,jk,jp_tem,Kmm), ztavg, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
       !
       ! 2. ------------Net heat flux and fresh water flux due to the ice shelf
@@ -161 +164 @@
    END SUBROUTINE isfpar_mlt_bg03
 
-   SUBROUTINE isfpar_mlt_oasis(kt, pqhc , pqoce, pqfwf )
+   SUBROUTINE isfpar_mlt_oasis(kt, Kmm, pqhc , pqoce, pqfwf )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE isfpar_mlt_oasis  ***
@@ -176 +179 @@
       !!-------------------------- IN  -------------------------------------
       INTEGER                     , INTENT(in   ) :: kt                  ! current time step
+      INTEGER                     , INTENT(in   ) :: Kmm                 !  ocean time level index
       !!--------------------------------------------------------------------
       INTEGER                           :: jk                            ! loop index
@@ -189 +193 @@
       ! 1. ------------Mean freezing point (needed for heat content flux)
       DO jk = 1,jpk
-         CALL eos_fzp(tsn(:,:,jk,jp_sal), ztfrz3d(:,:,jk), gdept_n(:,:,jk))
+         CALL eos_fzp(ts(:,:,jk,jp_sal,Kmm), ztfrz3d(:,:,jk), gdept(:,:,jk,Kmm))
       END DO
-      CALL isf_tbl(ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
+      CALL isf_tbl(Kmm, ztfrz3d, ztfrz, 'T', misfkt_par, rhisf_tbl_par, misfkb_par, rfrac_tbl_par )
       !
       ! 2. ------------Scale isf melt pattern with total amount from oasis