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

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

@@ -13 +13 @@
    USE isf, ONLY: cn_isfload   ! ice shelf variables
 
-   USE dom_oce, ONLY: e3w_n, gdept_n, risfdep, mikt ! vertical scale factor
+   USE dom_oce, ONLY: e3w, gdept, risfdep, mikt     ! vertical scale factor
    USE eosbn2 , ONLY: eos                           ! eos routine
 
@@ -27 +27 @@
 CONTAINS
 
-   SUBROUTINE isf_load ( pisfload )
+   SUBROUTINE isf_load ( Kmm, pisfload )
       !!--------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_load  ***
@@ -37 +37 @@
       REAL(wp), DIMENSION(jpi,jpj), INTENT(  out) :: pisfload
       !!-------------------------- IN  -------------------------------------
+      INTEGER,                      INTENT(in)    :: Kmm           ! ocean time level index
       !!----------------------------------------------------------------------
       !
@@ -45 +46 @@
       SELECT CASE ( cn_isfload )
       CASE ( 'isomip' )
-         CALL isf_load_isomip ( pisfload )
+         CALL isf_load_isomip ( Kmm, pisfload )
       CASE DEFAULT
          CALL ctl_stop('STOP','method cn_isfload to compute ice shelf load does not exist (isomip), check your namelist')
@@ -52 +53 @@
    END SUBROUTINE isf_load
 
-   SUBROUTINE isf_load_isomip( pisfload )
+   SUBROUTINE isf_load_isomip( Kmm, pisfload )
       !!--------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_load  ***
@@ -66 +67 @@
       REAL(wp), DIMENSION(jpi,jpj), INTENT(  out) :: pisfload
       !!-------------------------- IN  -------------------------------------
+      INTEGER,                      INTENT(in)    :: Kmm           ! ocean time level index
       !!--------------------------------------------------------------------
       INTEGER  :: ji, jj, jk
@@ -81 +83 @@
       !
       DO jk = 1, jpk                   !- compute density of the water displaced by the ice shelf 
-         CALL eos( zts_top(:,:,:), gdept_n(:,:,jk), zrhd(:,:,jk) )
+         CALL eos( zts_top(:,:,:), gdept(:,:,jk,Kmm), zrhd(:,:,jk) )
       END DO
       !
@@ -96 +98 @@
                !
                ! top layer of the ice shelf
-               pisfload(ji,jj) = pisfload(ji,jj) + (znad + zrhd(ji,jj,1) ) * e3w_n(ji,jj,1)
+               pisfload(ji,jj) = pisfload(ji,jj) + (znad + zrhd(ji,jj,1) ) * e3w(ji,jj,1,Kmm)
                !
                ! core layers of the ice shelf
                DO jk = 2, ikt-1
-                  pisfload(ji,jj) = pisfload(ji,jj) + (2._wp * znad + zrhd(ji,jj,jk-1) + zrhd(ji,jj,jk)) * e3w_n(ji,jj,jk)
+                  pisfload(ji,jj) = pisfload(ji,jj) + (2._wp * znad + zrhd(ji,jj,jk-1) + zrhd(ji,jj,jk)) * e3w(ji,jj,jk,Kmm)
                END DO
                !
                ! deepest part of the ice shelf (between deepest T point and ice/ocean interface
                pisfload(ji,jj) = pisfload(ji,jj) + (2._wp * znad + zrhdtop_isf(ji,jj) + zrhd(ji,jj,ikt-1)) &
-                  &                                              * ( risfdep(ji,jj) - gdept_n(ji,jj,ikt-1) )
+                  &                                              * ( risfdep(ji,jj) - gdept(ji,jj,ikt-1,Kmm) )
                !
             END IF