Changeset 14143 for NEMO/trunk/src/OCE/ISF

Timestamp:

2020-12-09T22:26:04+01:00 (3 years ago)

Author:

techene

Message:

#2385 add key_linssh equivalent to ln_linssh using domzr_substitute

Location:

NEMO/trunk/src/OCE/ISF

Files:

• isfcpl.F90 (modified) (4 diffs)
• isfstp.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ISF/isfcpl.F90

@@ -15 +15 @@
 #if defined key_qco
    USE domqco  , ONLY : dom_qco_zgr      ! vertical scale factor interpolation
+#elif defined key_linssh
+   !                                     ! fix in time coordinate
 #else
    USE domvvl  , ONLY : dom_vvl_zgr      ! vertical scale factor interpolation
@@ -117 +119 @@
       vv   (:,:,:,Kbb)   = vv   (:,:,:,Kmm)
       ssh (:,:,Kbb)     = ssh (:,:,Kmm)
-#if ! defined key_qco
+#if ! defined key_qco   &&   ! defined key_linssh
       e3t(:,:,:,Kbb)   = e3t(:,:,:,Kmm)
 #endif
@@ -217 +219 @@
       IF(lwp) write(numout,*) 'isfcpl_ssh : recompute scale factor from ssh (new wet cell,Kmm)'
       IF(lwp) write(numout,*) '~~~~~~~~~~~'
-#if ! defined key_qco
+#if defined key_qco
+      CALL dom_qco_zgr(Kbb, Kmm)
+#elif defined key_linssh
+      ! linear ssh : fix in time coord.
+#else
       DO jk = 1, jpk
          e3t(:,:,jk,Kmm) = e3t_0(:,:,jk) * ( 1._wp + (ht_0(:,:) + ssh(:,:,Kmm)) * r1_ht_0(:,:) )
@@ -223 +229 @@
       e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm)
       CALL dom_vvl_zgr(Kbb, Kmm, Kaa)
-#else
-      CALL dom_qco_zgr(Kbb, Kmm)
 #endif
       !

NEMO/trunk/src/OCE/ISF/isfstp.F90

@@ -87 +87 @@
             ze3t(:,:,jk) = e3t(:,:,jk,Kmm)
          END DO 
-         CALL isf_tbl_lvl( ht(:,:), ze3t, misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav )
+         CALL isf_tbl_lvl( ht(:,:), ze3t           , misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav )
 #else
-         CALL isf_tbl_lvl( ht(:,:),  e3t, misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav )
+         CALL isf_tbl_lvl( ht(:,:),  e3t(:,:,:,Kmm), misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav )
 #endif
          !
@@ -116 +116 @@
             ze3t(:,:,jk) = e3t(:,:,jk,Kmm)
          END DO
-         CALL isf_tbl_lvl( ht(:,:), ze3t, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par )
+         CALL isf_tbl_lvl( ht(:,:), ze3t           , misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par )
 #else
-         CALL isf_tbl_lvl( ht(:,:),  e3t, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par )
+         CALL isf_tbl_lvl( ht(:,:),  e3t(:,:,:,Kmm), misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par )
 #endif
          !