Changeset 12068 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/TRA/traisf.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.

File:

• NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/TRA/traisf.F90 (copied) (copied from NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/TRA/traisf.F90) (7 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/TRA/traisf.F90

@@ -35 +35 @@
 CONTAINS
 
-   SUBROUTINE tra_isf ( kt )
+   SUBROUTINE tra_isf ( kt, Kmm, pts, Krhs )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_isf  ***
@@ -41 +41 @@
       !! ** Purpose :  Compute the temperature trend due to the ice shelf melting (qhoce + qhc)
       !!
-      !! ** Action  : - update tsa for cav, par and cpl case
+      !! ** Action  : - update pts(:,:,:,:,Krhs) for cav, par and cpl case
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt   ! ocean time-step index
+      INTEGER                                  , INTENT(in   ) :: kt        ! ocean time step
+      INTEGER                                  , INTENT(in   ) :: Kmm, Krhs ! ocean time level indices
+      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) :: pts       ! active tracers and RHS of tracer equation
       !!----------------------------------------------------------------------
       !
@@ -55 +57 @@
       !
       ! cavity case
-      IF ( ln_isfcav_mlt ) CALL tra_isf_mlt(misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav, risf_cav_tsc, risf_cav_tsc_b, tsa)
+      IF ( ln_isfcav_mlt ) CALL tra_isf_mlt(misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav, risf_cav_tsc, risf_cav_tsc_b, pts(:,:,:,:,Krhs))
       !
       ! parametrisation case
-      IF ( ln_isfpar_mlt ) CALL tra_isf_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, risf_par_tsc, risf_par_tsc_b, tsa)
+      IF ( ln_isfpar_mlt ) CALL tra_isf_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, risf_par_tsc, risf_par_tsc_b, pts(:,:,:,:,Krhs))
       !
       ! ice sheet coupling case
       IF ( ln_isfcpl ) THEN
          !
-         IF ( kt == nit000  ) CALL tra_isf_cpl(risfcpl_tsc       , tsa)
-         IF ( kt == nit000+1) CALL tra_isf_cpl(risfcpl_tsc*0.5_wp, tsa)
+         IF ( kt == nit000  ) CALL tra_isf_cpl(Kmm, risfcpl_tsc       , pts(:,:,:,:,Krhs))
+         IF ( kt == nit000+1) CALL tra_isf_cpl(Kmm, risfcpl_tsc*0.5_wp, pts(:,:,:,:,Krhs))
          !
          ! ensure 0 trend due to unconservation of the ice shelf coupling
-         IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
+         IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(Kmm, risfcpl_cons_tsc, pts(:,:,:,:,Krhs))
          !
       END IF
       !
       IF ( ln_isfdebug ) THEN
-         CALL debug('tra_isf: tsa T', tsa(:,:,:,1))
-         CALL debug('tra_isf: tsa S', tsa(:,:,:,2))
+         CALL debug('tra_isf: pts(:,:,:,:,Krhs) T', pts(:,:,:,1,Krhs))
+         CALL debug('tra_isf: pts(:,:,:,:,Krhs) S', pts(:,:,:,2,Krhs))
       END IF
       !
@@ -86 +88 @@
       !! *** Purpose :  Compute the temperature trend due to the ice shelf melting (qhoce + qhc) for cav or par case
       !!
-      !! *** Action :: Update tsa with the surface boundary condition trend 
+      !! *** Action :: Update pts(:,:,:,:,Krhs) with the surface boundary condition trend 
       !!
       !!----------------------------------------------------------------------
@@ -103 +105 @@
       ztc(:,:) = 0.5_wp * ( ptsc(:,:,jp_tem) + ptsc_b(:,:,jp_tem) ) / phtbl(:,:)
       !
-      ! update tsa
+      ! update pts(:,:,:,:,Krhs)
       DO jj = 1,jpj
          DO ji = 1,jpi
@@ -123 +125 @@
    END SUBROUTINE tra_isf_mlt
    !
-   SUBROUTINE tra_isf_cpl( ptsc, ptsa )
+   SUBROUTINE tra_isf_cpl( Kmm, ptsc, ptsa )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_isf_cpl  ***
       !!
-      !! *** Action :: Update tsa with the ice shelf coupling trend 
+      !! *** Action :: Update pts(:,:,:,:,Krhs) with the ice shelf coupling trend 
       !!
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(inout) :: ptsa
       !!----------------------------------------------------------------------
+      INTEGER                              , INTENT(in   ) :: Kmm   ! ocean time level index
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in   ) :: ptsc
       !!----------------------------------------------------------------------
@@ -138 +141 @@
       !
       DO jk = 1,jpk
-         ptsa(:,:,jk,jp_tem) = ptsa(:,:,jk,jp_tem) + ptsc(:,:,jk,jp_tem) * r1_e1e2t(:,:) / e3t_n(:,:,jk)
-         ptsa(:,:,jk,jp_sal) = ptsa(:,:,jk,jp_sal) + ptsc(:,:,jk,jp_sal) * r1_e1e2t(:,:) / e3t_n(:,:,jk)
+         ptsa(:,:,jk,jp_tem) = ptsa(:,:,jk,jp_tem) + ptsc(:,:,jk,jp_tem) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
+         ptsa(:,:,jk,jp_sal) = ptsa(:,:,jk,jp_sal) + ptsc(:,:,jk,jp_sal) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
       END DO
       !