Changeset 11823 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcpl.F90

Timestamp:

2019-10-29T12:00:04+01:00 (4 years ago)

Author:

mathiot

Message:

rm useless USE statement, option compatibility test + minor changes

File:

• NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcpl.F90 (modified) (6 diffs)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcpl.F90

@@ -16 +16 @@
    USE isfutils       ! debuging
    USE lib_mpp        ! mpp routine
+   USE domvvl         ! vertical scale factor interpolation
    !
    USE in_out_manager ! I/O manager
@@ -62 +63 @@
       !
       ! mask velocity properly (mask used in restart not compatible with new mask)
-      un(:,:,:) = un(:,:,:,) * umask(:,:,:)
-      vn(:,:,:) = vn(:,:,:,) * vmask(:,:,:)
+      un(:,:,:) = un(:,:,:) * umask(:,:,:)
+      vn(:,:,:) = vn(:,:,:) * vmask(:,:,:)
       !
       ! Need to : - include in the cpl cons the risfcpl_vol/tsc contribution
@@ -91 +92 @@
    END SUBROUTINE isfcpl_rst_write
 
-   SUBROUTINE isfcpl_ssh ()
+   SUBROUTINE isfcpl_ssh
       !!---------------------------------------------------------------------- 
       !!                   ***  ROUTINE iscpl_ssh  ***
@@ -149 +150 @@
       sshn(:,:) = zssh(:,:) * ssmask(:,:)
       !
-      ! force to start on an euler time step
-      neuler = 0
-      !
       sshb(:,:) = sshn(:,:)
       !
+      ! recompute the vertical scale factor, depth and water thickness
+      CALL dom_vvl_zgr
+      !
    END SUBROUTINE isfcpl_ssh
 
-   SUBROUTINE isfcpl_tra ()
+   SUBROUTINE isfcpl_tra
       !!---------------------------------------------------------------------- 
       !!                   ***  ROUTINE iscpl_tra  ***
@@ -297 +298 @@
       tsn(:,:,:,jp_sal) = zts0(:,:,:,jp_sal) * tmask(:,:,:)
       !
+      tsb(:,:,:,:) = tsn(:,:,:,:)
+      !
       ! sanity check
       ! -----------------------------------------------------------------------------------------
@@ -383 +386 @@
       CALL lbc_lnk( 'iscpl', zqvolb, 'T', 1. )
       CALL lbc_lnk( 'iscpl', zqvoln, 'T', 1. )
-      DO jk = 1,jpk
-      CALL debug('zqvolb',zqvolb(:,:,jk))
-      END DO
-      DO jk = 1,jpk
-      CALL debug('zqvoln',zqvoln(:,:,jk))
-      END DO
       !
       ! get 3d tra increment to apply at the first time step